Commit graph

40647 commits

Author SHA1 Message Date
James B. Pollack
90dba7d472 tank rotation 2016-03-18 17:06:33 -07:00
James B. Pollack
9433ea8f06 syntax 2016-03-18 16:46:23 -07:00
James B. Pollack
8ae2468165 check 2016-03-18 16:44:33 -07:00
James B. Pollack
b112bb2080 start pos 2016-03-18 16:40:48 -07:00
James B. Pollack
d37ff80541 tank 2016-03-18 16:36:06 -07:00
James B. Pollack
2a3d3a187f Merge pull request #8 from ericrius1/dressingRoomFix
Fixes up dressing lights bugs
2016-03-18 16:12:56 -07:00
ericrius1
af234d56f1 uncomment stuff; 2016-03-18 16:12:28 -07:00
ericrius1
b61fec657c merge 2016-03-18 16:11:45 -07:00
ericrius1
3dace325b3 dressing room lights toggling on and off 2016-03-18 15:57:13 -07:00
ericrius1
a7d2ff7c29 fixed whiteboard markers not hsowing up 2016-03-18 15:23:53 -07:00
James B. Pollack
acba6817f2 hmm 2016-03-18 14:52:34 -07:00
ericrius1
bdfaadc892 living room lights emit texture toggling correctly 2016-03-18 14:31:51 -07:00
James B. Pollack
0aab01d774 remove switches to prep for next merge 2016-03-18 12:37:28 -07:00
ericrius1
4eb31c9459 Merge remote-tracking branch 'james/homereset' into dressingRoomFix 2016-03-18 11:58:29 -07:00
James B. Pollack
bc2270f4a0 kinetic objects 2016-03-18 11:48:03 -07:00
James B. Pollack
9e6cea2f41 gravity and cleaning 2016-03-18 10:55:10 -07:00
James B. Pollack
5dff9de3a0 reset by searching 2016-03-18 10:49:14 -07:00
James B. Pollack
0f17d1f12e add reset userdata to everything 2016-03-17 22:19:20 -07:00
James B. Pollack
c072cd323e start fish fix 2016-03-17 19:11:12 -07:00
James B. Pollack
855f505ae1 minor adjustments 2016-03-17 17:01:48 -07:00
ericrius1
c1725dda58 living room lights 2016-03-17 15:09:07 -07:00
James B. Pollack
8f00e9ea27 werk 2016-03-17 15:08:35 -07:00
ericrius1
009326b085 logs 2016-03-17 14:34:41 -07:00
ericrius1
ef0872ec52 fan switch working; 2016-03-17 14:31:48 -07:00
James B. Pollack
0789f869da tankfix 2016-03-17 11:18:56 -07:00
James B. Pollack
5dbec15ae0 logging 2016-03-17 11:10:28 -07:00
James B. Pollack
78775baf8c yo; 2016-03-17 11:06:46 -07:00
James B. Pollack
bb18366cbd clean and log 2016-03-17 10:58:24 -07:00
James B. Pollack
d9526b6506 utils 2016-03-17 10:45:52 -07:00
James B. Pollack
9933690ed6 whitebrd 2016-03-17 10:36:35 -07:00
James B. Pollack
bdcc621996 rotate whiteboard 2016-03-17 10:32:24 -07:00
James B. Pollack
5a6e0e4d80 clean 2016-03-17 10:15:53 -07:00
James B. Pollack
3432e7821f resets 2016-03-17 10:08:44 -07:00
James B. Pollack
fc3bac7fa5 changes 2016-03-17 09:57:57 -07:00
James B. Pollack
b080dd8c64 cleanup 2016-03-17 09:42:17 -07:00
James B. Pollack
16f2ef48fe adjust 2016-03-17 09:36:10 -07:00
James B. Pollack
c35e4bc78a working reset and ping pong 2016-03-17 09:18:12 -07:00
James B. Pollack
ed1913e58d add ping pong gun and enable some items 2016-03-17 01:03:21 -07:00
ericrius1
8339955071 removed vr vj 2016-03-16 19:06:42 -07:00
ericrius1
03c1bd2970 lights turning on and off 2016-03-16 19:03:36 -07:00
James B. Pollack
4dd3f2a097 moar 2016-03-16 18:37:21 -07:00
ericrius1
1fb1e32a85 fixed merge conflicts; 2016-03-16 17:55:19 -07:00
James B. Pollack
0193889690 line endings 2016-03-16 17:49:20 -07:00
James B. Pollack
8477b721a4 add kinetic objects 2016-03-16 15:48:17 -07:00
ericrius1
9d24887ff4 Merge remote-tracking branch 'upstream/master' 2016-03-15 13:50:23 -07:00
Brad Hefta-Gaub
5245b6f7be Merge pull request #7323 from howard-stearns/zone-visibility
Zone visibility
2016-03-15 13:44:40 -07:00
Chris Collins
e47c8896db Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 11:50:22 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master
Fill in the Downloads: line of the stats window
2016-03-15 10:42:09 -07:00
Anthony J. Thibault
7539eec134 Application: fix third-person and fullscreen-mirror toggle 2016-03-15 10:11:56 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00