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
|
eece235337
|
Adds preset images
|
2014-08-12 20:42:42 +05:30 |
|
Jayant Jain
|
b6e53d87c7
|
More decorations! (for dungeon preset)
|
2014-08-12 10:35:09 +05:30 |
|
Jayant Jain
|
5d8264e887
|
Takes care of overlapping walls for rooms
|
2014-08-12 10:35:09 +05:30 |
|
Jayant Jain
|
9d001524c6
|
Adds initial indoor preset for terrain generator
|
2014-08-12 10:35:09 +05:30 |
|
Ruben Vereecken
|
47f00f9b5e
|
Added achievement deleting and automatic achievement filling
|
2014-08-08 17:20:07 +02: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 |
|
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 |
|
Jayant Jain
|
d3962c19bd
|
Ensures randomised thang clusters do not overlap each other
|
2014-07-25 18:07:01 +05:30 |
|
Jayant Jain
|
f700ddea0c
|
Adds temporary hack for infinite loops in randomise
|
2014-07-25 18:06:54 +05:30 |
|
Jayant Jain
|
1790215fea
|
Adds rooms and doors to dungeon preset
|
2014-07-25 18:06:44 +05:30 |
|
Jayant Jain
|
9a24341fa5
|
Prevents overlapping of randomly generated thangs
|
2014-07-25 18:06:25 +05:30 |
|
Jayant Jain
|
3df2de8bec
|
Number of decorations scales appropriately with preset size
|
2014-07-25 18:06:13 +05:30 |
|
Jayant Jain
|
dce6254d4a
|
Fix for flickering thangs due to exact same coordinates
|
2014-07-25 18:06:03 +05:30 |
|
Jayant Jain
|
598e727500
|
Adds an initial dungeon preset, refactors border code to properly create dungeon walls
|
2014-07-25 18:05:49 +05:30 |
|
Jayant Jain
|
c33491b04d
|
Presets in terrain_generate_modal shown from a list instead of hardcoded
Conflicts:
app/templates/editor/level/modal/terrain_randomize.jade
|
2014-07-25 17:51:48 +05:30 |
|
Jayant Jain
|
af23c09799
|
Refactors some code for presets in terrain generator
|
2014-07-25 17:50:21 +05:30 |
|
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 |
|