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

1960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacksonmj
f1d686fb37 Merge pull request #62 from atlaua/master 
Fix build – Remove <version.h> include
 2012-05-06 04:44:17 -07:00
atlaua
1f01122517 Remove <version.h> include 
The last commit removed the empty includes/version.h. But as src/main.c
still refers to it, that causes the build to fail.

Fixes commit a1aeabe
 2012-05-06 12:47:34 +02:00
jacksonmj
a1aeabeee4 Change license from GPLv2+ to GPLv3+ 
Also add headers stating the license to some more of the source files
 2012-05-06 02:20:57 +01:00
jacksonmj
028eb4d9a5 Fix repeated download of same history thumbnail 
https://github.com/FacialTurd/The-Powder-Toy/issues/53
 2012-05-03 22:06:30 +01:00
Simon Robertshaw
429f106ebf Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-05-03 21:53:16 +01:00
Simon Robertshaw
89911666f0 Remove stupid debug output for thumbnail cache, no idea why I have not removed this earlier 2012-05-03 21:52:59 +01:00
jacksonmj
d0b57d7d99 Fix crash when pasting text on platforms which don't support it 2012-05-01 00:48:17 +01:00
chaos.powdertoy.co.uk
9c253b36f5 Version Increment 2012-04-30 23:12:46 +01:00
Simon Robertshaw
7eafedb61a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-04-30 23:12:14 +01:00
Simon Robertshaw
acf2515115 Oops, correct include AGAIN 2012-04-30 23:12:01 +01:00
chaos.powdertoy.co.uk
78c10d1c40 Version Increment 2012-04-30 23:04:35 +01:00
Simon Robertshaw
8a774c6771 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-04-30 23:04:21 +01:00
Simon Robertshaw
df3e358918 Correct header include in SDLmain.m 2012-04-30 23:04:00 +01:00
chaos.powdertoy.co.uk
d6e266a745 Version Increment 2012-04-30 22:55:59 +01:00
Simon Robertshaw
b1045fc319 Enable OPS 2012-04-30 22:55:45 +01:00
Simon Robertshaw
322da62dfa Woo, file opening for OS X 2012-04-30 22:42:07 +01:00
Simon Robertshaw
211770e818 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-04-30 21:49:40 +01:00
Simon Robertshaw
8397b6e51a Add PROP_NOAMBHEAT to prevent certain elements from being heated by Ambient heat, Add PROP_NOAMBHEAT to FILT to fix http://powdertoy.co.uk/Discussions/Thread/View.html?Thread=13579 2012-04-30 21:49:33 +01:00
jacksonmj
433c1881bc strncpy for loading sign text in OPS 2012-04-30 14:36:45 +01:00
jacksonmj
8872e33b44 Massive cleanup of sdl_scale, and fix moving a sign in the zoom window 2012-04-30 00:39:12 +01:00
savask
74979102b3 One gel particle can't absorb more than 100 water particles now. 2012-04-30 00:40:05 +07:00
jacksonmj
6717f4ff32 Save soap bubbles 2012-04-29 15:31:18 +01:00
jacksonmj
d7f798da60 Fix bounds checking for SING and make explosion pressure area smaller 
Making the area smaller means a bit less pressure is generated, but it
does stop the pressure going through walls
 2012-04-29 01:37:52 +01:00
jacksonmj
38057065c2 Fix bugs when moving signs 
Signs could not be repositioned on top of another sign (dependent on
the indices of the two signs), and could not be placed after selecting
an element from the menu.
 2012-04-29 00:39:18 +01:00
jacksonmj
34bfd77aa5 Line snapping for deco editor 2012-04-29 00:22:02 +01:00
jacksonmj
ade3fd9568 Delete signs when cutting; change sign location check when saving 
Save signs within the original box that was drawn by the user, not
within the box that has been expanded to match the wall grid
 2012-04-29 00:11:54 +01:00
jacksonmj
5d5b8143a4 OPS loading: don't replace existing particles twice, and clear soap ctype 2012-04-27 18:28:39 +01:00
chaos.powdertoy.co.uk
257c069da1 Version Increment 2012-04-27 18:18:14 +01:00
jacksonmj
6101c04ff9 Use an array instead of ctype to cache tron colour 2012-04-27 18:09:54 +01:00
jacksonmj
c8a1524d6b Save tmp2 for tron 2012-04-27 17:46:40 +01:00
jacksonmj
418bdf0892 Add tmp2 support to old console 2012-04-27 17:42:22 +01:00
chaos.powdertoy.co.uk
2dbb14b8b4 Version Increment 2012-04-27 13:53:56 +01:00
Simon Robertshaw
a75da2c4c3 Fix includes for OSX and BSD 2012-04-27 13:51:42 +01:00
savask
ffee9df8e6 It's hard to be a fool (fix for the fix) 2012-04-27 19:49:01 +07:00
savask
68ab2e3148 Gel won't move solids any more. 2012-04-27 19:36:08 +07:00
chaos.powdertoy.co.uk
1d36ac554c Version Increment 2012-04-27 12:50:01 +01:00
jacksonmj
1d59194bfc Fix compiler warning, GRAPHICS_FUNC_ARGS is not declared in graphics.h 2012-04-27 11:39:11 +01:00
Simon Robertshaw
9e18556ae6 BSD platform, -DBSD 2012-04-26 13:16:20 +01:00
Simon Robertshaw
5a2a3e5c1f Fix "return 0;" in function returning void (create_box) 2012-04-25 17:59:14 +02:00
Simon Robertshaw
b5a52838c7 Change STOR, PIPE, DUST to make correct use of .flags field. 2012-04-19 16:37:53 +01:00
savask
f93a829672 Fix sponge bug. 2012-04-19 21:42:25 +07:00
Simon Robertshaw
62ecf1d87e Ensure TRON head doesn't fade 2012-04-18 16:06:43 +01:00
cracker64
c0947d9fea Should fix any border crashes 2012-04-18 11:57:27 -03:00
savask
64629df1af Fix the bug where you could set "bad" temp to insulators. 2012-04-18 16:50:24 +07:00
cracker64
d4a9f86503 Better description for tron 2012-04-17 19:54:45 -03:00
chaos.powdertoy.co.uk
4b07454ad7 Version Increment 2012-04-17 22:38:57 +01:00
Simon Robertshaw
ffa5ccb666 Alterations to TRON and fancy effects 2012-04-17 22:38:27 +01:00
cracker64
a7e1774d41 Took wrong update function 2012-04-17 15:58:12 -04:00
cracker64
eccf5658d2 TRON element, needs to glow and fancy explosion on crash 2012-04-17 15:55:58 -04:00
savask
ff8ce0ef3a A small fix for convection. 2012-04-17 21:28:42 +07:00