Commit Graph

24755 Commits (bf28ce0eea86e4be1de47da83f4855aafe72688a)

Author SHA1 Message Date
eli bf28ce0eea sync with viewer-development 2012-11-28 12:10:00 -08:00
eli 8f7eee1349 sync with viewer-development 2012-11-21 11:42:51 -08:00
eli 7bddf05f89 sync with viewer-development 2012-11-16 15:49:30 -08:00
eli 18175874bf INTL-46 massive Chinese translation update for set28--set34, including new files 2012-11-07 14:31:03 -08:00
eli b51401e26c sync with viewer-development (for 1 DE file) 2012-11-07 14:29:59 -08:00
eli 2707fcf555 sync with viewer-development 2012-10-16 12:03:41 -07:00
eli 8b857580a8 FIX INTL-104 Translation of Set34 in 8 languages, including Steam content 2012-09-10 12:58:53 -07:00
eli 8638c65a3f FIX INTL-106 French linguistic fixes 2012-09-10 12:29:03 -07:00
eli faa513985c WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add new files 2012-09-04 19:17:19 -07:00
eli 22a851663c WIP INTL-46 Set24 translation for traditional chinese; add new files; remove obsolete files 2012-08-30 13:54:52 -07:00
eli 92a69950ab FIX INTL-101 translation of set33 for 8 languages; add new files; remove obsolete files 2012-08-30 13:40:14 -07:00
eli 28ff2c209d WIP INTL-46 Traditional Chinese translation for Set23TW (120829) 2012-08-29 13:36:14 -07:00
Oz Linden e51a57b895 pull back beta tag 2012-08-23 10:57:30 -04:00
Oz Linden 43d29ea03e merge changes for DRTVWR-202 2012-08-22 17:11:10 -04:00
Oz Linden d34e584b41 tag merge of DRTVWR-202 2012-08-22 17:11:08 -04:00
Oz Linden fcfc686d9c Added tag 3.4.0-beta4 for changeset 84fb70dfe344 2012-08-22 17:08:49 -04:00
callum_linden 848ed9cb2f Fix up white space to follow coding policy guidelines 2012-08-22 12:58:08 -07:00
Oz Linden f78861c7bc pull back release hotfix and beta fixes 2012-08-22 11:36:09 -04:00
Oz Linden 5c4babf0fd merge changes for DRTVWR-201 2012-08-22 11:12:55 -04:00
Oz Linden 0e4fa75e64 tag merge of DRTVWR-201 2012-08-22 11:12:53 -04:00
Oz Linden e4b553075e merge changes for 2012-08-22 10:51:52 -04:00
Oz Linden 63d04204a9 merge changes for DRTVWR-203 2012-08-22 08:46:19 -04:00
Oz Linden e0f391df2a tag merge of DRTVWR-203 2012-08-22 08:46:03 -04:00
Oz Linden 5949d605d7 merge back 3.4.0-beta3 fixes 2012-08-22 08:40:05 -04:00
Oz Linden 822dc1c580 storm-1906: correct cmake error when using precompiled llphysicsextensions_tpv 2012-08-21 09:30:55 -04:00
Oz Linden e7b378f0f1 Added tag 3.4.0-beta3 for changeset 182a9bf30e81 2012-08-20 15:22:32 -04:00
Oz Linden d381a1a4cf tag merge of DRTVWR-200 2012-08-20 15:22:05 -04:00
Oz Linden c2e902d56a merge back beta fixes 2012-08-20 14:45:47 -04:00
callum_linden 79cb549edf silly change to trigger a rebuild in Team City 2012-08-20 11:24:30 -07:00
callum_linden 44a934ef2a silly change to trigger a rebuild in Team City 2012-08-20 11:24:18 -07:00
Oz Linden 173364ed5d Added tag 3.3.4-release2 for changeset 7c9102fb9988 2012-08-20 10:43:45 -04:00
Oz Linden 36fa95058a tag merge of DRTVWR-199 2012-08-20 10:04:38 -04:00
Todd Stinson 6df52172c1 MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using angular velocity. 2012-08-17 15:43:13 -07:00
Aura Linden 3e05f169d6 Minor change required for merge from viewer-development 2012-08-17 09:04:16 -07:00
Aura Linden efdcf045b0 Merged in from viewer-development. 2012-08-17 08:07:15 -07:00
Oz Linden 2d28bc112a Added tag 3.4.0-beta2 for changeset b1dbb1a83f48 2012-08-16 21:28:23 -04:00
Oz Linden a0be18bd2e merge changes for DRTVWR-197 2012-08-16 21:27:50 -04:00
Oz Linden 331a76afaa tag merge of DRTVWR-197 2012-08-16 21:27:31 -04:00
callumprentice 56298eed3d Reverting Sabin's change to build system that we used during testing 2012-08-16 15:49:14 -07:00
Todd Stinson 2d51298641 PATH-852: Attempting to fix the format of the BMP cursors for linux. 2012-08-16 12:43:41 -07:00
callumprentice 48a964e5dd Silly Python 'string' fix 2012-08-16 11:48:51 -07:00
callumprentice ed92d45a5a Silly Python 'string' fix 2012-08-16 11:12:21 -07:00
callumprentice f94a296673 Silly typo fix 2012-08-16 10:11:42 -07:00
Oz Linden 79bf2c4929 merge changes for storm-1879 2012-08-16 11:00:55 -04:00
Oz Linden 0c903609d4 merge changes for storm-1895 2012-08-16 10:55:31 -04:00
Oz Linden 557376b95c merge changes for storm-1898 2012-08-16 10:41:10 -04:00
Oz Linden 39d79080c0 merge changes for storm-1899 2012-08-16 10:33:42 -04:00
Oz Linden a7d8b42509 merge up to latest viewer-development 2012-08-16 08:52:26 -04:00
callumprentice d400bc2a3f Add explicit reference to keychain to use 2012-08-15 20:04:10 -07:00
Oz Linden 7204593ec3 merge back beta fixes 2012-08-15 22:38:07 -04:00