livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,120 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

39120 Commits (8fc3956a5eeaa2dffabdcda60800d9c4d4e49c43)

Author SHA1 Message Date
Rider Linden 8fc3956a5e Use the EnvironmentInfo structure to pass information back from legacy environment requests. 2018-08-20 14:59:02 -07:00
Rider Linden 1e3ee272ae Add an apparent time of day. More OSX complaints. 2018-08-17 15:37:10 -07:00
Rider Linden 076836f245 Left off an override. 2018-08-17 13:26:03 -07:00
Rider Linden f33d3a40bb Merge 2018-08-17 12:38:08 -07:00
Rider Linden 1716129fd2 MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch. 2018-08-17 12:35:42 -07:00
Rider Linden 7f25bef9c4 MAINT-7703: Estate level switch turns of parcel environments. 2018-08-16 16:27:53 -07:00
Graham Linden 597d28ad34 Fix constness of LLSettingsVODay::buildDeepCloneAndUncompress. 2018-08-16 22:00:53 +01:00
Graham Linden 5ddd9d0c97 Make settings vfuncs use SETTINGS_OVERRIDE macro (override keyword in viewer codebase) to fix OS X compilation. 
Mark cloning funcs and derived class overrides as const.
 2018-08-16 21:38:49 +01:00
Rider Linden 6b70b8bcda Merge 2018-08-16 09:45:23 -07:00
Rider Linden 68158f0340 Pass call backs into parcel and region change methods. 2018-08-16 09:43:54 -07:00
andreykproductengine aa03fe54cc MAINT-8952 EEP make sure settings will be re-compressed 2018-08-16 17:59:24 +03:00
Rider Linden af2fa3c5bd Somebody left off override 2018-08-15 13:47:22 -07:00
Rider Linden d4aa55eade Merge 2018-08-15 13:37:54 -07:00
Rider Linden eadf0b9101 MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel 2018-08-15 13:35:53 -07:00
Rider Linden f028ddd075 Merged in andreykproductengine/maint-eep (pull request #49) 
MAINT-8996 EEP - fixed Settings picker is empty sometimes
 2018-08-15 18:59:58 +00:00
andreykproductengine c858343af5 MAINT-8996 EEP - fixed Settings picker is empty sometimes 2018-08-15 21:32:32 +03:00
Rider Linden 7f71083f9e Merged in andreykproductengine/maint-eep (pull request #48) 
MAINT-8952 EEP 'uncompress' day tracks before editing
 2018-08-15 17:33:37 +00:00
andreykproductengine 584fec695b MAINT-8952 EEP 'uncompress' day tracks before editing 2018-08-15 18:31:07 +03:00
Graham Linden 26514a0c80 Remove MSVC optimize pragma. 2018-08-14 21:13:11 +01:00
Graham Linden 8e9d27fdcd MAINT-8884 Re-arrange water norm/reflection tex binding to be less incorrect. 2018-08-14 21:10:54 +01:00
Rider Linden 30ef616af5 Merge 2018-08-10 09:43:52 -07:00
Rider Linden 44e1d3f7dc Merged in graham_linden/viewer-eep-graham (pull request #44) 
MAINT-8951
 2018-08-09 23:48:32 +00:00
Rider Linden 7a001186b3 Adjust layout of sunmoon panel and size of ext day edit. Blank sun texture. Fix edit and transition in edit day cycle. Fix default and blank images in sky textures. 2018-08-09 16:36:44 -07:00
Graham Linden 3a3d0cbc79 Disable nSight debug. 2018-08-09 22:48:52 +01:00
Graham Linden facc678391 MAINT-8951 
Remove moon_dir related shader code causing sunlight shadow artifacting.
 2018-08-09 22:46:47 +01:00
andreykproductengine 2a7600fbd2 MAINT-8887 Fixed Environment pulled from asset store not applied when loaded 2018-08-09 20:00:39 +03:00
Graham Linden fb13d9746d Merge 2018-08-09 15:53:43 +01:00
AndreyL ProductEngine 3dfd3be98e MAINT-8900 LLVirtualTrackball improvements: buttons behavior and mode select 2018-08-09 13:09:22 +03:00
Rider Linden 133900d31a Miss an || && in an if 2018-08-08 16:22:04 -07:00
Rider Linden 881ee670d9 Fix for mac build 
MAINT-8870, MAINT-8871: When legacy windlight fails load the default day cycle asset and use that.
 2018-08-08 15:41:28 -07:00
Graham Linden 126191ada5 Protect sky code from (extremely unlikely yet still possible) lack of sky settings. 2018-08-07 22:47:55 +01:00
Rider Linden cd5f7b2c03 MAINT-7703: Estate and region flags for parcel environmests (not written to DB yet) 2018-08-06 15:37:09 -07:00
andreykproductengine 21c6e6063f MAINT-8952 EEP Changing one Day Cycle Keyframe can change other keyframes 2018-08-06 16:22:06 +03:00
Rider Linden 057d115ac3 LLStoreAssetCallback now a std::function 2018-08-04 13:05:39 -07:00
Rider Linden 76206db45e remove some pragmas that snuck in 2018-08-03 22:21:43 -07:00
Rider Linden 7e8c849a15 Fix name change from clearTrack to clealCycleTrack 2018-08-03 16:57:04 -07:00
Rider Linden 3f6cedbbf3 Synch settings with simulator. 2018-08-03 16:32:31 -07:00
Rider Linden 56c773b3bc Merge 2018-08-03 16:19:47 -07:00
Rider Linden 8779b29487 Merge 2018-08-03 16:14:01 -07:00
Rider Linden b50d546d5f MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap 
MAINT-7703: Initial flags sent in message protocol for parcels
 2018-08-03 16:13:22 -07:00
andreykproductengine 51abc168c0 MAINT-8902 fix encroaching 'legacy' issues 2018-08-03 21:01:43 +03:00
AndreyL ProductEngine 6a54e0948d MAINT-8900 LLVirtualTrackball improvement: added click-to-set mode 2018-08-08 03:28:37 +03:00
Nat Goodspeed 09f97172bb MAINT-8176: Add canonical_repo field to viewer's autobuild.xml. 2018-08-02 16:08:53 -04:00
Nat Goodspeed 31afdea8a2 increment viewer version to 5.1.8 2018-08-02 16:02:58 -04:00
Nat Goodspeed ac2b54ae21 Added tag 5.1.7-release for changeset ac3b1332ad4f 2018-08-02 16:02:58 -04:00
andreykproductengine a1fdb88299 MAINT-8945 EEP clicking near a keyframe may activate it without highlighting it green 2018-08-02 19:58:05 +03:00
andreykproductengine a59170df0e MAINT-8905 EEP - tracks should show altitudes 2018-08-01 20:27:47 +03:00
Rider Linden dbbb89a13c Merge 2018-07-30 15:55:33 -07:00
Rider Linden d6ede8e81c MAINT-8904: Creating new setting in inventory now causes simulator to assign default asset ID to inventory item. 2018-07-30 15:54:36 -07:00
andreykproductengine d7ae8a0d28 MAINT-8344 EEP Make arrows white 2018-07-30 20:08:58 +03:00