matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,345 Commits 13 Branches 426 Tags 113 MiB
aa99258101
Commit Graph

4345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chaos.powdertoy.co.uk
f19e57e35c Version Increment 2012-01-26 14:17:26 +00:00
Simon Robertshaw
22acb277c0 Save PSv for now 2012-01-26 14:16:59 +00:00
Jacob1
fff85989e1 stickmen load correctly and are drawn in new save format, and fighters are drawn correctly in both 
Conflicts:

	src/save.c
 2012-01-26 22:15:57 +08:00
jacksonmj
7593f01389 Fix deco colour in prerender_save to work with other pixel formats 2012-01-26 22:15:57 +08:00
Jacob1
35270d1e37 save tmp2, show decoration color on stamps 2012-01-26 22:15:57 +08:00
jacksonmj
eaf2af6d40 Another change to the eval_move check in create_part 
Creating a particle where there was a wall but no existing particle was
broken, since eval_move returns 1 for moving into empty space.
 2012-01-26 22:15:56 +08:00
chaos.powdertoy.co.uk
ed2132b7d8 Version Increment 2012-01-26 14:08:05 +00:00
Simon Robertshaw
01fe58e20e Retrieve thumbnails, saves and info from caching server (static.powdertoy.co.uk) 2012-01-26 14:05:56 +00:00
Simon Robertshaw
9e1be78bc2 I've got to a point where I can no longer be bothered to think of a proper commit comment 2012-01-26 01:13:33 +00:00
Simon Robertshaw
b2d3257ae9 Better way of managing Controllers 2012-01-25 19:18:24 +00:00
Simon Robertshaw
c5cc1870f3 Fix some memory leaks 2012-01-25 18:42:35 +00:00
Simon Robertshaw
8b80942b16 Login working, segfaults sometimes 2012-01-25 17:21:55 +00:00
chaos.powdertoy.co.uk
5b527e7a9d Version Increment 2012-01-25 13:37:47 +00:00
jacksonmj
38124c5f6f Fix crash when JSON parsing fails 2012-01-25 21:33:22 +08:00
jacksonmj
a9c198dd46 Fix WARP destroying DMND 
If WARP moved in its update function, then the x/y variables in the main
loop were out of date. When the normal movement code ran, changes were
made to the wrong place in the pmap. This resulted in some particles
with low IDs being destroyed by the addition of WARP+SING.

This change might also fix the WARP+PRTI crash that I never managed to
reproduce.
 2012-01-25 21:33:22 +08:00
jacksonmj
32c9ff3099 Make RBDM/WATR explosion work again, by not killing fire created by WATR 2012-01-25 21:33:22 +08:00
jacksonmj
748a528fe0 Only check the bits actually used for wavelength in photon ctype 
Fixes black photons not being killed after passing through pipe
 2012-01-25 21:33:22 +08:00
jacksonmj
f0730818e4 OPS thumbnail crash fix, and blank thumbnails for saves from a newer version 2012-01-25 21:33:22 +08:00
Jacob1
4af8385a0e If you cancel an update, the yellow update box stays away 2012-01-25 21:33:21 +08:00
jacksonmj
44545d4c96 Solids wall description, and check build_save was successful when saving a stamp 2012-01-25 21:33:21 +08:00
Jacob1
509f1d2139 ability to delete corrupted stamps 2012-01-25 21:33:21 +08:00
jacksonmj
8a11b6b31d Check coordinates of signs before using them to read pmap or pressure 2012-01-25 21:33:21 +08:00
jacksonmj
ff6aa0227d transform_save should check wall coordinates against size in blocks, not the actual size 
Fixes crash when rotating a section of wall that is wider than YRES
 2012-01-25 21:33:21 +08:00
jacksonmj
edcf6d7b2f Whoops, eval_move returning 1 should not allow particle creation 2012-01-25 21:33:20 +08:00
jacksonmj
bdf277e687 Implement PROP_NEUTABSORB 2012-01-25 21:33:20 +08:00
jacksonmj
16ea042bab Make transform_save work with new save functions 
Conflicts:

	src/powder.c
 2012-01-25 13:31:05 +00:00
Simon Robertshaw
15310d0165 Revert "transform_save should check wall coordinates against size in blocks, not the actual size" 
This reverts commit 34c6043014.
 2012-01-25 13:29:45 +00:00
jacksonmj
34c6043014 transform_save should check wall coordinates against size in blocks, not the actual size 
Fixes crash when rotating a section of wall that is wider than YRES

Conflicts:

	src/save.c
 2012-01-25 13:27:28 +00:00
Simon Robertshaw
a27074fc47 Revert "Some fixes for compiling with Visual Studio - void* and inline" 
This reverts commit ea619f5542.
 2012-01-25 13:26:10 +00:00
jacksonmj
ea619f5542 Some fixes for compiling with Visual Studio - void* and inline 2012-01-25 13:25:44 +00:00
Simon Robertshaw
3505bcc275 Login window close on success 2012-01-25 00:59:19 +00:00
Simon Robertshaw
9cdf2b5902 Login complete (minus brokenness) 2012-01-25 00:57:39 +00:00
Simon Robertshaw
35858ef607 Fix textbox 2012-01-24 23:33:32 +00:00
Simon Robertshaw
04e4a2346d Wall menus 2012-01-24 21:19:29 +00:00
Simon Robertshaw
97b35bc470 Various 2012-01-24 20:19:19 +00:00
Simon Robertshaw
04488081d3 Save name label position and alignment 2012-01-23 22:59:35 +00:00
Simon Robertshaw
df72f2580f Better element buttons, Save preview WIP 2012-01-23 22:53:57 +00:00
Simon Robertshaw
2bd571e159 GameController shut down any render options open 2012-01-23 11:48:08 +00:00
Simon Robertshaw
27755b2f27 Render options 2012-01-23 11:44:20 +00:00
Simon Robertshaw
8a65c395f4 Element menu 2012-01-23 10:50:48 +00:00
Simon Robertshaw
8c0678fa48 Begining menu, tool 2012-01-22 23:24:49 +00:00
Simon Robertshaw
19c1fa5dcb Brush class for drawing on simulation, more interface for game 2012-01-22 14:45:37 +00:00
Simon Robertshaw
91bb5a8b78 Add remaining buttons for game screen 2012-01-22 11:15:34 +00:00
FrankBro
57ab7bca76 Merge remote-tracking branch 'origin/master' 2012-01-22 00:45:10 -05:00
FrankBro
cb92acd0b7 Started the rest of the UI 2012-01-22 00:45:03 -05:00
FrankBro
43cebb5780 This qtcreator project files can build and run. 2012-01-21 22:56:29 -05:00
Simon Robertshaw
3a283d4f3c Nice graphics for Showing windows 2012-01-21 23:29:40 +00:00
Simon Robertshaw
dea70befcf Basic skeleton for save preview 2012-01-21 22:48:37 +00:00
Simon Robertshaw
984d39f8cc Reset page on sort change 2012-01-21 19:43:36 +00:00
Simon Robertshaw
1cee908c16 Fix thumbnail crash, turns out SaveButton was storing a Thumbnail pointer, not a Thumbnail as I thought 2012-01-21 18:51:28 +00:00