Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 03:17:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27328 commits 71 branches 56 tags 1.2 GiB
Commit graph

27328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
426b343e2c remove cruft canAppendBytes() method 2015-06-26 23:12:48 -07:00
Andrew Meadows
4d4b97fe59 add priority promotion to reduce volunteer races 
also fix priority inheritance from chained collisions
 2015-06-26 22:30:06 -07:00
Brad Hefta-Gaub
9b42221123 Merge pull request #5216 from ctrlaltdavid/comment-update 
Improve entity properties list code comment
 2015-06-26 22:21:39 -07:00
Andrew Meadows
f274958beb fix bad merge during rebase 2015-06-26 22:13:06 -07:00
Andrew Meadows
e18506c77f promote volunteer priority 
also remove some cruft
change uint8_t to be quint8
 2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6 pack terse update parameters near each other 
also don't constantly resend ownership data
 2015-06-26 22:00:43 -07:00
Andrew Meadows
ff67b54f87 don't read terse update data for objs we own 2015-06-26 21:58:40 -07:00
Andrew Meadows
1ba937eab9 fix bug in streaming of SimulationOwner class 2015-06-26 21:58:40 -07:00
Andrew Meadows
40f6ecd936 fix crash for dereference null pointer 2015-06-26 21:58:40 -07:00
Andrew Meadows
44d3074561 remove debug code 2015-06-26 21:58:03 -07:00
Andrew Meadows
12fc18092b SimulationOwner as one property 2015-06-26 21:58:03 -07:00
Andrew Meadows
b6d5adaef8 move global into function that uses it 2015-06-26 21:57:04 -07:00
Andrew Meadows
cf74dbe1dc partial progress toward sim ownership negotiations 
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
 2015-06-26 21:57:04 -07:00
Andrew Meadows
c87e7c99ce bid for ownership on script-change phys properties 2015-06-26 21:57:04 -07:00
Andrew Meadows
4b29907216 trigger bid for ownership on action manipulations 2015-06-26 21:57:04 -07:00
Andrew Meadows
a33c350385 improved forcing of simulator ownership bid 2015-06-26 21:57:04 -07:00
Andrew Meadows
8510110324 increase sim priority when flagged for ownership 2015-06-26 21:57:04 -07:00
Andrew Meadows
2579247c34 claim ownership faster for scripted manipulations 2015-06-26 21:57:04 -07:00
Andrew Meadows
7c793c6397 accept simulation release from entity-server 2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514 more work on simulator priority 
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
 2015-06-26 21:57:04 -07:00
Andrew Meadows
82ba5cd4b6 sim ownership uses expiry, apply priority rules 2015-06-26 21:57:04 -07:00
Andrew Meadows
443c7d9c70 allow equal priority to take simulation ownership 2015-06-26 21:57:04 -07:00
Andrew Meadows
8afd9a5e1d add EntityItem::_simulatorPriority as uint8_t 2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Seth Alves
9f6ec4120d undo previous experiment 2015-06-26 18:43:56 -07:00
Brad Davis
e6fade8c13 Prevent tooltips from appearing with stale data 2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73 Fixing always-on link cursor 2015-06-26 18:14:31 -07:00
Seth Alves
0739c46249 if new action data is the same as the old action data, don't re-unpack it 2015-06-26 18:13:53 -07:00
Clément Brisset
252286bdc1 Merge pull request #5226 from Atlante45/html 
Restore jquery
 2015-06-26 18:00:04 -07:00
Atlante45
7aae36d73e Restore jquery 2015-06-26 17:58:53 -07:00
Brad Hefta-Gaub
fbf2f51ded Merge pull request #5224 from sethalves/fix-nan-in-vec3 
don't try to convert a vec3 containing NaN to a script value
 2015-06-26 17:55:38 -07:00
Seth Alves
0f3ac976c3 don't try to convert a vec3 containing NaN to a script value 2015-06-26 17:53:28 -07:00
Brad Hefta-Gaub
8ee0bd24fe Merge pull request #5222 from birarda/ac-failover 
add a forced failover for hanging STUN dns lookup
 2015-06-26 17:40:11 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Seth Alves
7def9c2e28 better handle failure to rez the stick 2015-06-26 17:10:50 -07:00
Brad Davis
84505c49c4 Merge pull request #5213 from birarda/hyperlink-photo 
add photo replacement for hyperlinked places
 2015-06-26 17:05:33 -07:00
Seth Alves
5e65972265 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 16:55:34 -07:00
Seth Alves
1326791502 add sanity check to PhysicalEntitySimulation::addAction 2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d clean up left-over action if it's re-added 2015-06-26 16:54:46 -07:00
Seth Alves
300d35219d move functions our of header to cpp file 2015-06-26 16:54:01 -07:00
Niraj Venkat
9101b4ad70 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 16:28:01 -07:00
Seth Alves
8a6ab68eda Merge pull request #5217 from ZappoMan/fixDeadlock 
Fix for deadlock
 2015-06-26 16:27:30 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
Seth Alves
b4537b081f fix clearActions 2015-06-26 16:02:47 -07:00
Seth Alves
db580d1e0b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 15:45:24 -07:00
ZappoMan
f61581d29d possible fix for deadlock 2015-06-26 15:42:04 -07:00
David Rowe
8d83e23bab Improve entity properties list code comment 2015-06-26 15:37:16 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00