Nick Winter
|
85a9a558ef
|
Fixed #1329.
|
2014-08-30 13:43:56 -07:00 |
|
Matt Lott
|
437ab0feb2
|
PVP waiting screen in real-time view
|
2014-08-29 21:46:26 -07:00 |
|
Nick Winter
|
5503b3a2bc
|
Fixed #1147.
|
2014-08-29 17:03:02 -07:00 |
|
Scott Erickson
|
570380c2a4
|
Merge branch 'master' into feature/defaults
|
2014-08-29 08:14:43 -07:00 |
|
Nick Winter
|
f74a152942
|
Fixed #1104.
|
2014-08-28 18:55:33 -07:00 |
|
Scott Erickson
|
9406a8c920
|
Merge branch 'master' into feature/defaults
|
2014-08-28 17:58:58 -07:00 |
|
Nick Winter
|
e67b4ae064
|
Fixed #1090.
|
2014-08-28 17:08:05 -07:00 |
|
Scott Erickson
|
2dde77f8b0
|
Merge branch 'master' into feature/defaults
|
2014-08-28 15:26:04 -07:00 |
|
Scott Erickson
|
154b91c753
|
Changed LevelLoader to always deeply load components and thang types, not just for hero levels.
|
2014-08-28 15:19:04 -07:00 |
|
Nick Winter
|
0fa5d264f4
|
Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle.
|
2014-08-28 14:25:37 -07:00 |
|
Nick Winter
|
f79a2848fd
|
Fixed #1038. Focus should now remain on code editor when after clicking on Surface.
|
2014-08-28 14:00:54 -07:00 |
|
Nick Winter
|
1094d09aa5
|
Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode.
|
2014-08-28 11:23:52 -07:00 |
|
Nick Winter
|
d7ae07c012
|
Fixed Facebook login bug.
|
2014-08-28 11:16:55 -07:00 |
|
Scott Erickson
|
8b943d1c2c
|
Merged conflicts.
|
2014-08-28 09:59:03 -07:00 |
|
Nick Winter
|
ec6b3d7e5f
|
Fixed #1481. More Mediator schema fixes.
|
2014-08-28 09:27:42 -07:00 |
|
Nick Winter
|
cd3bf4d0db
|
Fixed a few bugs.
|
2014-08-27 18:05:18 -07:00 |
|
Nick Winter
|
92b29915e2
|
Finished fixing #841.
|
2014-08-27 17:26:56 -07:00 |
|
Nick Winter
|
3f16aaab61
|
Fixed a few more Backbone Mediator event validation issues.
|
2014-08-27 16:31:44 -07:00 |
|
Nick Winter
|
ee9e453896
|
Fixed #828. Added many other minor refactorings.
|
2014-08-27 12:24:11 -07:00 |
|
Scott Erickson
|
ac2c39a266
|
Fixed an infinite loop bug in CoordinateGrid.
|
2014-08-27 09:49:37 -07:00 |
|
Nick Winter
|
6ff01f7deb
|
Fixed #814.
|
2014-08-26 18:11:35 -07:00 |
|
Scott Erickson
|
5d804c6d9a
|
Fixed merge conflict.
|
2014-08-26 15:41:59 -07:00 |
|
Nick Winter
|
a5c18a4140
|
Fixed #453.
|
2014-08-26 15:22:13 -07:00 |
|
Nick Winter
|
7300c4b3b8
|
Finished removing grid from playback options menu.
|
2014-08-26 14:00:03 -07:00 |
|
Nick Winter
|
35b107cf58
|
Refactored grid. Fixed #158.
|
2014-08-26 13:56:57 -07:00 |
|
Nick Winter
|
3e9adf6b1a
|
Fixed issue with IndieSprites no longer coloring properly.
|
2014-08-26 12:39:30 -07:00 |
|
Scott Erickson
|
f92a665b8b
|
Merge conflicts.
|
2014-08-26 09:53:04 -07:00 |
|
Nick Winter
|
832402af6e
|
Merged/tweaked GitHub login.
|
2014-08-26 08:37:11 -07:00 |
|
Nick Winter
|
898bb69477
|
Added missing Countdown Screen file.
|
2014-08-26 08:18:06 -07:00 |
|
Nick Winter
|
e666ee1dac
|
Added stop playback button and real-time countdown screen.
|
2014-08-25 22:05:30 -07:00 |
|
Scott Erickson
|
1406a970ea
|
Bunch of fixes to get the level editor working again.
|
2014-08-25 20:34:46 -07:00 |
|
Nick Winter
|
6fb0073eae
|
Fixed harmless Wizard startup animation error.
|
2014-08-25 16:15:34 -07:00 |
|
Nick Winter
|
e48b218533
|
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
|
2014-08-25 15:39:47 -07:00 |
|
Nick Winter
|
9df0cfb93f
|
A few changes to flags UX.
|
2014-08-25 14:02:23 -07:00 |
|
Scott Erickson
|
d392994a83
|
Merge branch 'master' into feature/defaults
|
2014-08-25 13:00:33 -07:00 |
|
Nick Winter
|
718d586f07
|
A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in.
|
2014-08-24 21:39:34 -07:00 |
|
Nick Winter
|
1a7e4554f0
|
Fixed a few minor bugs.
|
2014-08-24 16:48:59 -07:00 |
|
Nick Winter
|
3125c2b129
|
Add flag cursor and pending flags.
|
2014-08-24 16:09:06 -07:00 |
|
Nick Winter
|
f44d802934
|
Fixed a couple bugs. Flags are now colored.
|
2014-08-24 12:33:46 -07:00 |
|
Nick Winter
|
be07f9cfb9
|
Many improvements to real-time streaming and flags.
|
2014-08-23 22:24:00 -07:00 |
|
Nick Winter
|
2dca4d72fc
|
Rudimentary flag buttons are in.
|
2014-08-23 19:00:35 -07:00 |
|
Nick Winter
|
f59084e651
|
Sending flag history to the World for to make flag Thangs during simulation.
|
2014-08-23 17:26:56 -07:00 |
|
Scott Erickson
|
0721b49216
|
Refactoring defaults.
|
2014-08-23 15:51:59 -07:00 |
|
Nick Winter
|
c79541f669
|
Full-screen playback during real-time mode.
|
2014-08-23 13:54:52 -07:00 |
|
Nick Winter
|
f2adb7ec7f
|
Skipping serialization/deserialization of needless Programmable clones.
|
2014-08-23 11:16:02 -07:00 |
|
Nick Winter
|
0431f70954
|
Improved Surface playback fast-forwarding.
|
2014-08-23 09:52:05 -07:00 |
|
Nick Winter
|
9c0869e566
|
Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!
|
2014-08-22 21:35:08 -07:00 |
|
Nick Winter
|
6fee881efd
|
Fixed a few more issues with playback.
|
2014-08-22 17:11:40 -07:00 |
|
Nick Winter
|
ee41796b73
|
Fixed some wonkiness with the playback scrubbing while streaming worlds.
|
2014-08-22 15:32:23 -07:00 |
|
Nick Winter
|
92f0a68dd1
|
World streaming is getting there!
|
2014-08-22 14:59:32 -07:00 |
|
Nick Winter
|
611ecbf470
|
Fixed many issues with world streaming.
|
2014-08-22 12:39:29 -07:00 |
|
Nick Winter
|
9b31e28536
|
More improvements to world streaming.
|
2014-08-21 21:23:45 -07:00 |
|
Nick Winter
|
bd380e4a09
|
World streaming is starting to work!
|
2014-08-21 17:30:46 -07:00 |
|
Nick Winter
|
d55afa77b7
|
Began streaming a mighty stream.
|
2014-08-21 16:27:52 -07:00 |
|
Nick Winter
|
3755cb9d66
|
Fixed some bugs with sprite layer ordering.
|
2014-08-20 18:57:33 -07:00 |
|
Nick Winter
|
28176c7f72
|
Misc workarounds.
|
2014-08-20 13:26:48 -07:00 |
|
Nick Winter
|
df7f1b2b9b
|
Now have 'free' rotationType, equivalent to previous default of undefined.
|
2014-08-19 22:33:33 -07:00 |
|
Nick Winter
|
def4d01c8e
|
Starting to let us control the size of the achievements popup, although much more Sass math is needed.
|
2014-08-19 19:21:36 -07:00 |
|
Nick Winter
|
91db8397a0
|
Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators.
|
2014-08-19 08:09:15 -07:00 |
|
Nick Winter
|
2c6fc67db2
|
Some simulation and ladder fixes. Preparing Criss-Cross tournament.
|
2014-08-18 21:49:58 -07:00 |
|
Nick Winter
|
2588ec67ff
|
Fix for buildLoop still trying to loop after LevelLoader destruction for some reason.
|
2014-08-18 14:09:28 -07:00 |
|
Nick Winter
|
8ca9374de0
|
Zoom-aware, ratio-based edge avoidance (polish for #1448).
|
2014-08-18 14:08:54 -07:00 |
|
Scott Erickson
|
86ba46b64c
|
Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand.
|
2014-08-18 13:43:17 -07:00 |
|
Pete DiSalvo
|
a011f118e3
|
Added CoordinateDisplay edge detection. Doesn't account for camera zoom.
|
2014-08-16 18:51:47 -04:00 |
|
Pete DiSalvo
|
eed68c0a1c
|
Working orientation. Doesn't account for camera zoom
|
2014-08-16 18:30:41 -04:00 |
|
Pete DiSalvo
|
31e609c0c8
|
Added edge detection to camera, and worked on orientations
|
2014-08-16 18:30:41 -04:00 |
|
Pete DiSalvo
|
dc7529344c
|
Working on orientation
|
2014-08-16 18:30:41 -04:00 |
|
Pete DiSalvo
|
8f6d162542
|
Beginning work on edge detection
|
2014-08-16 18:30:41 -04:00 |
|
Nick Winter
|
5f20e6f05e
|
Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet.
|
2014-08-15 12:09:56 -07:00 |
|
Ruben Vereecken
|
40818fd7bc
|
GitHub Login implemented
|
2014-08-15 16:20:45 +02:00 |
|
Nick Winter
|
69c22db434
|
Moved Hero Placeholder replacement logic to Level's denormalizeThang.
|
2014-08-14 16:35:03 -07:00 |
|
Nick Winter
|
0f983bdcf1
|
Crude steps towards using your hero equipment in items levels.
|
2014-08-14 15:12:15 -07:00 |
|
Nick Winter
|
7286d069a0
|
Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.
|
2014-08-14 10:28:50 -07:00 |
|
Nick Winter
|
652d47fb81
|
Merge pull request #1432 from jayant1992/undo-redo
Undo redo descriptions
|
2014-08-14 09:58:28 -07:00 |
|
Ruben Vereecken
|
3fd396974d
|
Merge branch 'master' into achievements
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
|
2014-08-13 10:43:42 +02:00 |
|
Jayant Jain
|
76c784b1de
|
Adds default scripts whenever a new level is created
|
2014-08-13 12:11:37 +05:30 |
|
Nick Winter
|
4cc79e985e
|
A few fixes for adding items to inventories in ThangTypes.
|
2014-08-11 17:09:44 -07:00 |
|
Nick Winter
|
9a5cd22069
|
Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels.
|
2014-08-11 16:15:46 -07:00 |
|
Nick Winter
|
31d7e641e6
|
Fixes for equipping items and adding them to the World.
|
2014-08-11 11:04:38 -07:00 |
|
Nick Winter
|
cf7e2042c9
|
Got bitten by another case of #1108.
|
2014-08-11 10:02:39 -07:00 |
|
Nick Winter
|
706ab7a251
|
Trying to get item ThangType nodes and inventory loading working.
|
2014-08-10 22:09:13 -07:00 |
|
Ruben Vereecken
|
e6569539dc
|
User page now uses the supermodel for user loading
|
2014-08-08 19:26:24 +02:00 |
|
Ruben Vereecken
|
47f00f9b5e
|
Added achievement deleting and automatic achievement filling
|
2014-08-08 17:20:07 +02:00 |
|
Ruben Vereecken
|
3bfd341363
|
Goal states are now tracked in level sessions (state.goalStates)
|
2014-08-08 13:10:31 +02:00 |
|
Scott Erickson
|
94ca62f4c5
|
Fixed a bug I added in some minor final changes.
|
2014-08-07 18:48:30 -07:00 |
|
Scott Erickson
|
cc025942f8
|
Extended the LevelLoader to load thang types and components dynamically for hero levels.
|
2014-08-07 18:27:47 -07:00 |
|
Scott Erickson
|
0c5364eebb
|
Removed editorMode.
|
2014-08-07 14:22:43 -07:00 |
|
Nick Winter
|
4d4e321265
|
Fixed #1062. Added Item kind to level editor Thang filters.
|
2014-08-06 08:24:50 -07:00 |
|
Nick Winter
|
852dabc17a
|
Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance.
|
2014-08-06 07:43:56 -07:00 |
|
Nick Winter
|
74283bafed
|
Made sure items equip themselves within the SpriteBoss, too.
|
2014-08-05 21:47:51 -07:00 |
|
Ruben Vereecken
|
5d66560673
|
Merge remote-tracking branch 'upstream/master' into achievements_progress
Conflicts:
app/views/editor/level/LevelEditView.coffee
server/levels/sessions/LevelSession.coffee
|
2014-08-05 11:55:46 +02:00 |
|
Ruben Vereecken
|
c165d46e17
|
Fixed missing errors bug
|
2014-08-04 20:02:26 +02:00 |
|
Ruben Vereecken
|
6267352c6e
|
Drastically changed the way achievements get grayscaled
|
2014-08-04 15:29:46 +02:00 |
|
Ruben Vereecken
|
30a6cf1cca
|
Merged in name changes from master
|
2014-07-29 17:28:13 +02:00 |
|
Michael Schmatz
|
c4e3044a81
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-07-23 14:44:17 -07:00 |
|
Michael Schmatz
|
07cc01332d
|
Merge branch 'pr/1383'
Conflicts:
app/views/play/level/tome/SpellListTabEntryView.coffee
|
2014-07-23 14:44:15 -07:00 |
|
Nick Winter
|
26ac94367e
|
Fixed #1372. Minor fixes.
|
2014-07-23 08:59:42 -07:00 |
|
Scott Erickson
|
1c3404d03e
|
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
|
2014-07-23 07:02:45 -07:00 |
|
Dominik Kundel
|
9cb704a843
|
last fix for dimming the editor
|
2014-07-23 15:09:15 +02:00 |
|
Dominik Kundel
|
be50927fb6
|
disabled editor works again
|
2014-07-23 14:38:12 +02:00 |
|