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

1147 commits

Author SHA1 Message Date
Seth Alves
300d35219d move functions our of header to cpp file 2015-06-26 16:54:01 -07:00
Seth Alves
b4537b081f fix clearActions 2015-06-26 16:02:47 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa put upper bound on size of serilized action parameters so they'll fit in MTU 2015-06-26 12:11:34 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
bwent
0516caaa32 Added CHECK_PROPERTY_CHANGE macro 2015-06-24 14:58:33 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c quiet compiler 2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36 save encoded action data rather than generating it on demand 2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e deleted empty files I accidently committed. 2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e Code review 2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Seth Alves
7f4e3f8216 when deserializing action, remove any existing actions that weren't part of the serialized data 2015-06-22 13:12:34 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
Seth Alves
c14276145d lock when reading or writing _actionsToAdd or _actionsToRemove 2015-06-22 07:19:40 -07:00
ericrius1
dbec1aad0c line entity points are now local to entity position. Changed paint script to reflect this 2015-06-19 18:54:28 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
6deedd19a3 zero velocities when we clear simulatorID 2015-06-19 16:19:21 -07:00
Seth Alves
fca06d9d3d add actionData to properties that EntityItem transmits and receives 2015-06-19 09:36:06 -07:00
Seth Alves
fce551099f first stab at sending action data across wire 2015-06-18 18:32:57 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
ericrius1
8183e7393d adding check for points inside bounds' 2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
816726efdc Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 15:33:46 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
3e758a8f43 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00