Lirusaito
4de23007a5
Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down.
...
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
2012-01-11 11:04:12 -05:00
Shyotl
89e738003c
Default RednerDelayVBUpdate to false.
2012-01-03 20:28:15 -06:00
Shyotl
a3f7399d7d
Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported).
2012-01-03 20:27:56 -06:00
Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
b4dad425aa
Fixed wind not mixing with other audio. Play no more than 30 world sounds at once (new sounds just muted until channels free up). Add fmod profiler support (SHEnableFMODExProfiler). Use FMOD_UNICODE on windows instead of loading files manually and sending raw data to fmod. Incl other misc cleanup.
2011-12-23 02:29:49 -06:00
Shyotl
1bfa72fa7c
V3 merge. Slight update. Fixes lighting oddities.
2011-12-16 01:50:57 -06:00
Shyotl
0030ca3af7
Fixed extra post-process shaders. Cleaned up and no longer using deprecated functions.
2011-12-16 01:46:20 -06:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
TighMacFanatic
2565caf62a
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-03 11:52:29 -05:00
Siana Gearz
697dd7e929
Preparing to add mesh upload.
2011-12-03 03:43:23 +01:00
TighMacFanatic
f613be9276
Added new water windlight
2011-12-02 10:41:53 -05:00
TighMacFanatic
f40bbb1602
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-12-01 12:13:42 -05:00
Siana Gearz
66f4c170cb
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-12-01 16:51:43 +01:00
Shyotl
8e7733b2ce
Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)
2011-11-24 01:03:03 -06:00
Siana Gearz
b8eb3076ce
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-11-23 23:21:14 +01:00
TighMacFanatic
56b28756ad
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-19 21:36:41 -05:00
TighMacFanatic
13fad75811
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-19 21:36:32 -05:00
Shyotl
1fd908b2c4
Removed maximum_alpha uniform (as it's always 1.0 anyhow)
2011-11-19 15:13:16 -06:00
Drake Arconis
6aa7f219cd
Merge remote-tracking branch 'upstream/master'
2011-11-08 05:22:47 -05:00
Siana Gearz
7fea7c589d
Make floating text draw distance tunable
2011-11-08 01:26:51 +01:00
Siana Gearz
5de4f1e2da
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-07 02:36:24 +01:00
Sovereign Engineer
844e38702a
Merge remote-tracking branch 'upstream/master'
2011-11-03 14:32:35 -04:00
Shyotl
6964cec6f1
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into future
2011-10-31 20:41:36 -05:00
Drake Arconis
a35ef93d19
Right Click Mouse Scroll Zoom and Xcode fix
2011-10-31 15:43:05 -04:00
Siana Gearz
231af66b90
Fixing for OS X
2011-10-31 16:00:05 +01:00
Shyotl
0fde15246b
Moved some settings out of the main settings.xml and into settings_sh.xml where they belong.
2011-10-22 01:57:39 -05:00
Siana Gearz
bd6d14d741
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-10-22 01:17:59 +02:00
Shyotl
53f5957b92
Animated faces with bumpmapping now behave as expected.
2011-10-21 15:03:46 -05:00
Siana Gearz
df3d30acd9
Version 1.6.0.0
2011-10-17 03:56:47 +02:00
Siana Gearz
0130423d93
Rev changed grid management incompatibly -.-
2011-10-15 04:46:35 +02:00
Siana Gearz
591610f211
New tag list to include Radegast
2011-10-09 03:23:04 +02:00
Siana Gearz
7c53fec576
Merge commit 'fb05f258e41591d4ebd87ed4abf7725996984956' into future
2011-10-09 02:19:42 +02:00
RevolutionSmythe
d7c2701773
Fix the grass.xml so that they don't have odd names that show up in the UI.
2011-10-04 06:08:32 +02:00
Siana Gearz
0a9c611dfd
Merge back the ability to select the tree (not just random, from Imprudence).
...
Conflicts:
indra/newview/app_settings/settings.xml
indra/newview/llfloatertools.cpp
2011-10-04 06:07:52 +02:00
Siana Gearz
9ac2c07f52
Merge https://github.com/PlayerDagostino/SingularityViewer into future
...
Conflicts:
indra/llplugin/llplugininstance.cpp
indra/llwindow/llwindowsdl.cpp
indra/llwindow/llwindowsdl.h
indra/newview/llpreviewnotecard.cpp
indra/newview/llviewerwindow.h
2011-10-03 16:10:35 +02:00
Shyotl
36600462d1
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
...
Conflicts:
indra/newview/hippopanelgrids.cpp
indra/newview/llstartup.cpp
indra/newview/llsurface.cpp
indra/newview/llviewermessage.cpp
indra/newview/llviewerparceloverlay.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
5d21e676c6
Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc
2011-09-02 04:07:39 -05:00
Shyotl
59d50f3062
Meshy update. Mostly related to cost calculations... mostly.
2011-08-28 04:05:36 -05:00
Shyotl
c66065b688
CachedControl cleanup in random places. LL's ctor format is supported, so using such in LL code to ease diffs.
2011-08-28 01:04:30 -05:00
Shyotl
9d40820937
New object/avatar interp.
2011-08-19 01:36:01 -05:00
Shyotl
20ef149dcb
Added test setting 'ShyotlUseLegacyTextureBatching' to disable new texture indexing. The new indexing method requires heavy branching in shaders, which some hardware may not perfom well with.
2011-08-16 02:37:18 -05:00
Shyotl
f551294e66
Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet.
2011-08-12 19:20:11 -05:00
Fritigern Gothly
fb05f258e4
Windlight presets from Phoenix, and from LL v3.0
2011-08-13 02:04:48 +02:00
Shyotl
c9860f7b66
Massive deferred update...
...
Plus renamed setupViewport to setup[2|3]DViewport.
Migrated mWindowRect to mWindowRectRaw, mVirtualWindowRect to mWindowRectScaled.
Slowly updating getwindow/getworldview calls to new v2 variants as I run across them.
Cleaned up ascent-related code in llmanip.cpp.
Impostor update tweaks.
Edgepatch water occlusion changes. (no patch flickering on edges of screen while moving camera)
2011-08-11 03:16:17 -05:00
Siana Gearz
c6e0c2f323
This should fix the settings
2011-08-11 00:53:17 +02:00
Siana Gearz
23c5d5dd48
Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/newview/lltexturefetch.cpp
2011-08-10 23:21:14 +02:00
Shyotl
ca328aec72
Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)
2011-08-10 03:53:49 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Siana Gearz
2e88db37ad
Signed warning in texture fetcher
2011-08-07 22:32:07 +02:00
Shyotl
9aa26648c9
Added CurlUseMultipleThreads (requires restart to change)
2011-08-06 02:29:04 -05:00