Matt Lott
|
16ed1ffee9
|
Add cocodb/ to .gitignore for Windows setup
Created by the Windows development environment setup script
|
2014-08-08 13:26:48 -07:00 |
|
Nick Winter
|
dc59aff9d0
|
Starting skeleton for GameMenuModal and its subviews.
|
2014-08-08 11:36:41 -07:00 |
|
Ruben Vereecken
|
e6569539dc
|
User page now uses the supermodel for user loading
|
2014-08-08 19:26:24 +02:00 |
|
Nick Winter
|
cc0ea25262
|
Merge pull request #1412 from rubenvereecken/meh
Table headers are now unhoverable
|
2014-08-08 08:38:05 -07:00 |
|
Nick Winter
|
523fd3e4ca
|
Merge pull request #1417 from jayant1992/master
Level editor fixes
|
2014-08-08 08:30:53 -07:00 |
|
Ruben Vereecken
|
47f00f9b5e
|
Added achievement deleting and automatic achievement filling
|
2014-08-08 17:20:07 +02:00 |
|
Jayant Jain
|
593c31f33c
|
Shows dragged component over other layers
|
2014-08-08 18:16:12 +05:30 |
|
Jayant Jain
|
93fd301300
|
Increases add treema line height, components are selected after being added
|
2014-08-08 18:02:20 +05:30 |
|
Jayant Jain
|
164e049202
|
Hides randomize button overlay, resolves #1409
|
2014-08-08 18:02:20 +05:30 |
|
Ruben Vereecken
|
3bfd341363
|
Goal states are now tracked in level sessions (state.goalStates)
|
2014-08-08 13:10:31 +02:00 |
|
Ruben Vereecken
|
9f0add22a5
|
Worked in a lot of changes Scott proposed
|
2014-08-08 11:54:53 +02:00 |
|
Scott Erickson
|
9403d39b61
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-07 18:48:41 -07:00 |
|
Scott Erickson
|
94ca62f4c5
|
Fixed a bug I added in some minor final changes.
|
2014-08-07 18:48:30 -07:00 |
|
Nick Winter
|
9363665610
|
Merge pull request #1416 from Darredevil/patch-13
Added new level 'QuickSort the Spiral'
|
2014-08-07 18:31:53 -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 |
|
Darredevil
|
bea6e12a3a
|
Minor name fix
|
2014-08-08 03:26:13 +03:00 |
|
Darredevil
|
3dfe7987ea
|
Added new level 'QuickSort the Spiral'
|
2014-08-08 02:04:02 +03:00 |
|
Scott Erickson
|
0c5364eebb
|
Removed editorMode.
|
2014-08-07 14:22:43 -07:00 |
|
Ruben Vereecken
|
e082d363be
|
Table headers are now unhoverable
|
2014-08-07 13:12:30 +02:00 |
|
George Saines
|
0549273d14
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-06 17:42:33 -07:00 |
|
George Saines
|
b8ea89b4a8
|
community page redesign
|
2014-08-06 17:42:19 -07:00 |
|
Scott Erickson
|
29770bd220
|
Added a function for denormalizing levels, extending level thang components and configs with ones from thang types.
|
2014-08-06 15:18:22 -07:00 |
|
Nick Winter
|
5cf6a2fae7
|
Merge branch 'master' into production
|
2014-08-06 14:30:59 -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 |
|
kisik21
|
46c6051102
|
Update ru.coffee
|
2014-08-06 02:42:30 +04:00 |
|
Nick Winter
|
8d643380a0
|
Merge branch 'master' into production
|
2014-08-05 15:07:16 -07:00 |
|
Scott Erickson
|
eceac0bbc9
|
Hiding the randomize button overlay until #1409 is handled.
|
2014-08-05 15:06:11 -07:00 |
|
Scott Erickson
|
d5a8d8dc72
|
Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108.
|
2014-08-05 14:56:11 -07:00 |
|
Scott Erickson
|
c5d496c063
|
Removed a bit for debugging.
|
2014-08-05 13:40:36 -07:00 |
|
Scott Erickson
|
30998ecbec
|
Fixed components w/out changes sometimes showing up in the save level modal.
|
2014-08-05 13:21:45 -07:00 |
|
Ruben Vereecken
|
06ba50f5e2
|
Added user images
|
2014-08-05 18:58:37 +02:00 |
|
Ruben Vereecken
|
d42922871e
|
Added related achievements tab to level editor
|
2014-08-05 15:15:53 +02:00 |
|
Ruben Vereecken
|
7d7d5300c0
|
Refactored New Model Modal (from SearchView originally)
|
2014-08-05 14:33:33 +02: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 |
|
Dominik Kundel
|
84c0fbd01f
|
use shortName as fallback for some entries if no snippet
|
2014-08-05 11:19:15 +02:00 |
|
Nick Winter
|
3bbdee583d
|
Better problem alert layout for alerts that include hints.
|
2014-08-04 20:16:12 -07:00 |
|
Nick Winter
|
33b1f9ba6e
|
Merge branch 'master' into production
|
2014-08-04 19:46:11 -07:00 |
|
Nick Winter
|
a0b75ddb8e
|
Put Sky Span up for testing.
|
2014-08-04 19:46:00 -07:00 |
|
Dominik Kundel
|
f09b3c4792
|
Merge remote-tracking branch 'upstream/master'
|
2014-08-04 23:03:28 +02:00 |
|
Dominik Kundel
|
50517431db
|
added support for inserting snippets by shift+click
|
2014-08-04 23:02:54 +02:00 |
|
Dominik Kundel
|
86eea93e2f
|
merged changes
|
2014-08-04 22:37:15 +02:00 |
|
Ruben Vereecken
|
3266e3b46b
|
intermediate
|
2014-08-04 22:21:43 +02:00 |
|
Nick Winter
|
85011d1ed4
|
No need to explicitly track subviews for determining what the current view is.
|
2014-08-04 13:21:42 -07:00 |
|
Nick Winter
|
062927d38e
|
Merge pull request #1408 from Darredevil/patch-12
Typo fix
|
2014-08-04 13:15:35 -07:00 |
|
Darredevil
|
a11649b12b
|
Typo fix
|
2014-08-04 23:15:01 +03:00 |
|
Nick Winter
|
0bcaf70d56
|
Merge pull request #1406 from rubenvereecken/forms_fix
Fixed missing errors bug
|
2014-08-04 12:49:22 -07:00 |
|
Nick Winter
|
a6d3191aa8
|
Merge branch 'rubenvereecken-server_handler_refactor'
|
2014-08-04 12:48:50 -07:00 |
|
Nick Winter
|
84ccde9fd3
|
Merged User editableProperties move with adding savedEmployerFilterAlerts to editableProperties.
|
2014-08-04 12:48:41 -07:00 |
|