a25f898703
merge
2011-05-02 14:52:12 -05:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
95f41fbd9b
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Mac.
...
Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the
corresponding Mac file.
2011-04-25 13:46:31 +02:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
252cb50c38
merge changes for storm-1088
2011-04-20 20:21:55 -04:00
47b8d252ff
corrected issue in doc/contributions.txt
2011-04-20 07:13:53 -04:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
26b15973af
STORM-1088: fix loading of winmm.dll
2011-04-17 08:04:02 -04:00
af6133dfa5
merge
2011-04-15 14:13:57 -05:00
04f79f6358
STORM-956 Ability to mute dialogs by muting object (or object owner)
2011-04-15 13:13:15 -04:00
7577ec25a0
STORM-1095 FIX Chat preferences > font size should increase size of input text in the chat box.
...
Submitting on behalf of Jonathan Yap.
2011-04-14 00:52:40 +03:00
efa26485df
STORM-1128 Sort the results of using search in the World Map
2011-04-13 15:09:44 -04:00
88a7262340
merge changes for storm-1098
2011-04-12 20:38:04 -04:00
c857064af2
merge changes for storm-1101
2011-04-12 20:35:33 -04:00
3e7481064f
fix contributions.txt whitespace
2011-04-09 18:40:35 -04:00
ab483c6e7c
STORM-1147: fix skin-tight clothing
2011-04-09 17:10:09 -04:00
51b75b8832
merge changes for storm-1108
2011-04-08 17:34:49 -04:00
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
f41cbc0ac8
merge changes for storm-1094
2011-04-06 07:32:56 -04:00
3c5dc8b9d3
STORM-1098 : Made change to debug setting description for ShowNetStatus
2011-04-05 12:37:03 -04:00
ca186a6401
Parenthisized a #define to make it safer, adjusted some notes (and added a TODO) around some extremely obscure code that needs further attention but which is outside this scope.
2011-04-04 10:24:43 -07:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
8ccf3fbe3b
Automated merge up from viewer-development into mesh-development
2011-03-31 16:40:57 -04:00
a71e0b1862
pull latest changes from viewer-development
2011-03-30 17:37:19 -04:00
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
9c0757511e
merge changes for storm-1077
2011-03-29 19:19:24 -04:00
567035a2f7
STORM-1094 Chat preferences > font size should increase size of input text in IM window
2011-03-25 17:58:20 -04:00
c7cacf7d67
STORM-1108 Enable Hints menu entry/preference is confusing
2011-03-25 17:17:05 -04:00
40e14802e3
forgot to update contributions.txt
2011-03-24 12:56:15 +01:00
be545aa51b
STORM-1090 : add attribution for the fix to Nicky
2011-03-23 20:40:35 -07:00
67561663da
STORM-1101 Using the -login parameter makes some keys and right click menus not work
2011-03-23 14:55:28 -04:00
be553242ef
Automated merge up from viewer-development into mesh-development
2011-03-21 10:38:39 -04:00
819c7f0dd2
document contributions from Nicky Perian
2011-03-20 07:48:29 -04:00
abc259618f
merged OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 22:43:33 +01:00
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
6ec5177667
OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 21:07:09 +01:00
fef21534e9
OPEN-37 : pull into viewer-autobuild2010
2011-03-18 15:35:20 -07:00
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
3b1dee9abf
OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to
...
use VS2010 Autobuild
2011-03-18 08:05:36 -04:00
25b69823e6
merge changes for storm-1064
2011-03-16 21:24:21 -04:00
Dave Parks