Commit graph

5060 commits

Author SHA1 Message Date
ZappoMan
d89b29581b remove assert in favor of warning 2014-09-03 17:14:34 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close
Update assignment client to close on WM_CLOSE message on Windows
2014-09-03 16:43:12 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00
Andrzej Kapolka
f33a33401f Merge pull request #3338 from Atlante45/rec_file_format_tweaks
AC playback control scripts
2014-09-03 15:05:20 -07:00
ZappoMan
76511762dc fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities 2014-09-03 13:14:06 -07:00
ZappoMan
756840d541 CR feedback 2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7 fix method names for CR feedback 2014-09-03 12:44:57 -07:00
ZappoMan
ca3cf6d517 removed dead code 2014-09-03 12:42:51 -07:00
ZappoMan
59d0bb29a2 useless semicolon removal 2014-09-03 12:28:35 -07:00
ZappoMan
9a02545d9e useless semicolon removal 2014-09-03 12:26:05 -07:00
ZappoMan
f5b9fabdb9 fix CR feedback 2014-09-03 12:12:08 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
Ryan Huffman
5937830443 Update getWindowTitleBarHeight signature 2014-09-03 08:27:18 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
Ryan Huffman
1ee23a1661 Add Windows.h include to ShutdownEventListener 2014-09-03 08:04:39 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
ZappoMan
446daa81a5 fix issue of server clock skew changing without breaking animation and moving 2014-09-02 20:01:41 -07:00
ZappoMan
e8b1497d60 revert to old _lastUpdated behavior to fix animations and movement 2014-09-02 19:28:33 -07:00
ZappoMan
9cf6fcdaab warning fix 2014-09-02 18:45:38 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
ZappoMan
9fa087571b tweak to save SVO logic 2014-09-02 17:10:41 -07:00
Andrew Meadows
7c04a25095 fix whitespace formatting of curly braces 2014-09-02 16:29:20 -07:00
Atlante45
5c88485eb9 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-02 13:58:05 -07:00
Ryan Huffman
67cefc8d54 Reduce height of RunningScripts so titlebar is inside main window 2014-09-02 13:12:52 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
ZappoMan
10d581925c DRY up the property reading code by using macro for repeated pattern 2014-09-02 10:31:26 -07:00
ZappoMan
799931aa6c DRY up the property setting code by using macro for repeated pattern 2014-09-02 09:30:28 -07:00
ZappoMan
033017346c removed debug code 2014-09-02 08:53:19 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
ZappoMan
fa5c2b9638 removed todo file 2014-09-01 23:09:18 -07:00
ZappoMan
ea22073ddc removed some accidentally added code 2014-09-01 23:05:23 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
ZappoMan
1fa587b88a suppress unchanged entities 2014-08-29 21:51:08 -07:00
ZappoMan
d1a046e6ed properly handle LOD in rendering by not rendering small entities 2014-08-29 21:18:31 -07:00
ZappoMan
ed670ff48e fix bug with animations randomly not working 2014-08-29 20:19:24 -07:00
ZappoMan
2fab662e8c fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit 2014-08-29 17:48:14 -07:00
Andrew Meadows
a71823353b merge upstream/master into andrew/ragdoll 2014-08-29 16:46:33 -07:00
AndrewMeadows
431d69e9d9 Merge pull request #3330 from Atlante45/rec_file_format_tweaks
Rec file format tweaks
2014-08-29 16:10:03 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face
with unit tests
2014-08-29 14:23:00 -07:00
ZappoMan
f654fac851 fixed a couple crashes in editing entities 2014-08-29 10:56:07 -07:00
ZappoMan
06a9116082 updated TODO 2014-08-28 22:15:22 -07:00
ZappoMan
97706e3aed updated TO DO 2014-08-28 22:05:01 -07:00