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 |
|
Nick Winter
|
8a86e86012
|
Merge pull request #1390 from Imperadeiro98/master
Update pt-PT.coffee
|
2014-08-04 12:45:13 -07:00 |
|
Nick Winter
|
f1dec89473
|
Merge pull request #1407 from jayant1992/master
Adding components while editing thangs is easier
|
2014-08-04 12:06:11 -07:00 |
|
Ruben Vereecken
|
c165d46e17
|
Fixed missing errors bug
|
2014-08-04 20:02:26 +02:00 |
|
Ruben Vereecken
|
fb3848359e
|
Merge branch 'master' into achievements
|
2014-08-04 17:55:44 +02:00 |
|
Ruben Vereecken
|
6267352c6e
|
Drastically changed the way achievements get grayscaled
|
2014-08-04 15:29:46 +02:00 |
|
Jayant Jain
|
549f2657ea
|
Styles add button for addComponentsTreema
|
2014-08-04 07:53:24 +05:30 |
|
Jayant Jain
|
06875ce2b8
|
Resolves bug with mouseenter and mouseleave callbacks for add components treema
|
2014-08-04 07:21:02 +05:30 |
|
Jayant Jain
|
9e1513eb56
|
Add button on hover for addComponentsTreema
|
2014-08-04 07:05:22 +05:30 |
|
Jayant Jain
|
98f43b679f
|
Adds component upon double click, newly added components are automatically selected
|
2014-08-04 06:04:35 +05:30 |
|
Jayant Jain
|
03d696c3df
|
Components can now be added to thangs by dragging and dropping
|
2014-08-04 05:51:12 +05:30 |
|
Ruben Vereecken
|
26085f9f3e
|
Added a bunch of achievements to the script. Restyled big parts.
|
2014-08-03 23:58:51 +02:00 |
|
Imperadeiro98
|
0663dbc414
|
Update pt-PT.coffee
|
2014-08-01 10:39:30 +01:00 |
|
Imperadeiro98
|
4b932593be
|
Update pt-PT.coffee
|
2014-07-31 18:39:13 +01:00 |
|
Imperadeiro98
|
96fb84362a
|
Update pt-PT.coffee
|
2014-07-31 18:21:23 +01:00 |
|
Imperadeiro98
|
c7212226ae
|
Update pt-PT.coffee
|
2014-07-31 18:01:09 +01:00 |
|
Imperadeiro98
|
68e3110e74
|
Update pt-PT.coffee
|
2014-07-31 17:38:14 +01:00 |
|
Michael Schmatz
|
ca7b8ca10a
|
Merge pull request #1401 from rubenvereecken/test_fix
Repaired TestView by only loading js files once
|
2014-07-31 08:14:59 -07:00 |
|
Michael Schmatz
|
e7de8e3282
|
Merge pull request #1396 from rubenvereecken/refactoring
[Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)
|
2014-07-31 08:12:18 -07:00 |
|
Michael Schmatz
|
2ebc7f5aa6
|
Merge pull request #1398 from jayant1992/master
Updates for script tab in level editor
|
2014-07-31 08:12:04 -07:00 |
|
Michael Schmatz
|
52b8dd8db3
|
Merge pull request #1400 from rubenvereecken/moment_update
Added Moment i18n support
|
2014-07-31 08:11:01 -07:00 |
|
Michael Schmatz
|
0b9df5150d
|
Merge pull request #1393 from Melondonut/patch-3
Korean translation - patch3
|
2014-07-31 08:10:22 -07:00 |
|