Latif Khalifa
664d5ab7fc
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-28 22:22:14 +01:00
Latif Khalifa
3284b77df2
Downgraded freetype to 2.3.9 to avoid font issues in the newer version
2013-10-28 22:21:07 +01:00
Latif Khalifa
2c1512dcbe
Try finding FMOD Ex from registry intall path instead of hard coded location
2013-10-28 20:38:51 +01:00
Latif Khalifa
d8728f17ee
Don't install 64 bit viewer on 32 bit OS
2013-10-28 20:23:35 +01:00
Latif Khalifa
603221fa48
Rebuilt glod using VC11 runtime
2013-10-28 19:26:17 +01:00
Inusaito Sayori
8670f45287
Fix mouselook crosshair drawing properly
2013-10-28 12:22:58 -04:00
Aleric Inglewood
aa5bc7bc25
Compile fix (libcwd)
2013-10-27 15:14:11 +01:00
Shyotl
5e8c7264da
Fix artifacts from local stash merge.
2013-10-26 19:58:54 -05:00
Shyotl
6474568125
Call updateLOD when geom enters rigged state.
2013-10-26 19:09:43 -05:00
Shyotl
c1feb11d98
SH-3860. Cloud on first load issue. I'm sure the inaccessible jira has more details...
2013-10-26 18:56:39 -05:00
Shyotl
edf75a7174
setCommitOnReturn moved to from llbutton to lluictrl, cleanup some focus/key handling, avoid needless reshape calls.
2013-10-26 18:12:56 -05:00
Shyotl
30c5b9514e
Let the rendertarget dictate internal format when resizing.
2013-10-26 18:09:34 -05:00
Shyotl
8e55d5499e
Occlusion FBOs in deferred.
2013-10-26 18:07:56 -05:00
Shyotl
574022ed2c
Made a few more fullbright face types occlude any glow behind them.
2013-10-26 18:01:36 -05:00
Shyotl
fc04f6b2e1
Added handling of GL_LUMINANCE pixel format to setManualImage. Was missing, although GL_LUMINANCE_ALPHA and GL_ALPHA were handled.
...
Also added missing file hurr.
2013-10-26 16:42:41 -05:00
Shyotl
7c7c64bde3
Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw
2013-10-26 16:39:31 -05:00
Shyotl
2a432f73da
Try and squelch some warnings regarding nightvision post shader on amd gpus.
2013-10-26 16:36:38 -05:00
Shyotl
f4863527aa
Migrate ui scale/translation transform matrix stacks to LLAlignedArray.
2013-10-26 16:29:38 -05:00
Shyotl
8441bc80a4
Use LLStaticHashedString for faster uniform lookup.
2013-10-26 16:26:46 -05:00
Latif Khalifa
3979ad46f6
Separate out the cache directory for windows 64
2013-10-24 10:24:18 +02:00
Latif Khalifa
f4f4a39c01
Revert accidental removal of tcmalloc for 32 bit
2013-10-24 09:53:51 +02:00
Inusaito Sayori
fcce986266
Fix crash signature 256
2013-10-24 02:38:47 -04:00
Latif Khalifa
bcfe5232fb
Merge branch 'windows64' of github.com:lkalif/SingularityViewer
2013-10-24 01:37:45 +02:00
Latif Khalifa
6708019a40
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-24 01:37:27 +02:00
Latif Khalifa
8565616c9d
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-24 01:37:19 +02:00
Latif Khalifa
938736b77f
Win64: moved prebuilts to their permanent location
2013-10-24 01:25:45 +02:00
Shyotl
8e94c43a54
Fix a tp crash, and rework sound preloading slightly.
2013-10-23 17:23:20 -05:00
Inusaito Sayori
2b7e78cb3b
That commit where I touch all the ascentprefs headers to make them conform to standard because it's been annoying me too long.
2013-10-23 17:47:33 -04:00
Inusaito Sayori
41303d0c9c
Added "Log button opens external text editor (Windows only)" to Adv. Chat UI
2013-10-23 17:44:27 -04:00
Inusaito Sayori
4821d02051
Sometimes UI get this syncing feeling... but then everything seems fine.
2013-10-22 23:59:50 -04:00
Inusaito Sayori
fd42029a61
LLViewerWindow::handleKey(): Partial Fix for Issue 704: Keyboard shortcuts that should be passed to focused text fields are instead passed to selected prims when building
...
All edit keys now work, but Ctrl-A still doesn't work right, it must be grabbed by something else...
Adds LLFocusMgr::keyboardFocusHasAccelerators()
Adds virtual bool LLView::hasAccelerators() which returns false by default, overrides returning true placed in LLPreviewScript and LLPreviewNotecard
Shortcut keys added to notecard and script menu xmls
I'm thinking Qarl's Align tool handling may be receiving the Ctrl-A, we do seem to handle it differently than Exodus and Firestorm something modern could have broken the old way..
Come to think of it, those two features(Align and Select all prims) have a longstanding shortcut conflict in shortcuts... that's pretty nasty
2013-10-22 23:35:53 -04:00
Inusaito Sayori
574d0dab8d
LLViewerWindow::handleKey(): Also handle keys for navigating through the displayed menu
2013-10-22 22:39:15 -04:00
Inusaito Sayori
1aee941cb6
LLViewerWindow::handleKey(): The work in progress bits of the sync, commented out
2013-10-22 09:19:38 -04:00
Inusaito Sayori
75ee99f4d5
LLViewerWindow::handleKey(): More harmlessness (sync)
...
Handle Tabbing through elements/floaters earlier.
Combine g*Menu*View handleKey() checks.
2013-10-22 09:08:41 -04:00
Inusaito Sayori
45cd0157ef
LLViewerWindow::handleKey(): Code cleanup, bit of harmless sync
...
Moved Notifications Console into the advanced menu for login, so it's not shoved in as a hack, also a bit easier to access
2013-10-22 08:16:12 -04:00
Latif Khalifa
b800e877f9
More manifest gymnastics
2013-10-22 14:01:46 +02:00
Inusaito Sayori
9ec10cf246
Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature
...
Switches to exodus implementation
Includes relicensing of LLViewerCamera and LLToolComp
Maintains use of the old saved zoomed setting
2013-10-22 07:47:43 -04:00
Latif Khalifa
f545952136
Copy vc++ runtime libs, ignore size_t related warnings in the release build on win64
2013-10-22 11:25:32 +02:00
Latif Khalifa
f7cea9ac74
Added a way to identify 64 bit viewer in help -> about
2013-10-22 01:08:39 +02:00
Latif Khalifa
22db8f56f1
WIP[win64]: installer
2013-10-22 00:59:26 +02:00
Latif Khalifa
5cd7f05851
VS2012 related changes
2013-10-22 00:58:05 +02:00
Inusaito Sayori
dde18dfc0f
Added a setting, LiruMouselookMenu, in case people don't want this feature.
2013-10-21 16:01:31 -04:00
Inusaito Sayori
d95e1800e1
Miscellaneous touchups
...
Fixes chatbar not handling ctrl+shift+arrow for word selection
lltoolmgr.cpp sync
Removes some pointless dead code from llviewertexteditor.cpp
2013-10-21 15:15:17 -04:00
Latif Khalifa
73e1a9ad78
WIP[win64]: we haz 64 bit webkit
2013-10-21 20:42:31 +02:00
Latif Khalifa
ea6adb7ae4
WIP[win64]: Sync this snipped with upstream to avoid texture indexing issues on Windows 64
2013-10-21 15:56:13 +02:00
Latif Khalifa
93e62a375c
WIP[win64]: Rebuilt jpeglib, libpng, fixed loading of fmodex
2013-10-20 20:17:03 +02:00
Latif Khalifa
52c8c68d12
Reduce unbearable notification span when a plugin fails to load
2013-10-20 20:16:21 +02:00
Latif Khalifa
f9531904f5
WIP[win64]: Rebuilt jpeglib
2013-10-20 18:07:23 +02:00
Latif Khalifa
17c59f25f5
WIP[win64]: it builds, runs. webkit disabled in cmake for now
2013-10-20 17:03:48 +02:00
Latif Khalifa
6bae4a8d92
WIP: native win64 support
2013-10-20 12:37:35 +02:00