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

1050 Commits

Author SHA1 Message Date
jacksonmj
e1959c0c0b Zoom toggle, alt+z 2011-08-29 19:28:11 +08:00
jacksonmj
42cfb74c2b Remove blocking walls from pmap 
2.5% speed increase on a screen full of water
 2011-08-27 18:37:03 +08:00
Bryan Hoyle
f97e8e5c7c Merge remote branch 'origin/master' 2011-08-26 10:20:16 -04:00
Bryan Hoyle
4340b84499 Fixed some possible coding errors 2011-08-26 10:19:43 -04:00
Simon Robertshaw
efc7565b6f More stuff for CO2 2011-08-26 11:56:46 +01:00
Bryan Hoyle
10f0c6665f Merge remote branch 'origin/master' 2011-08-25 18:45:35 -04:00
Bryan Hoyle
1c291ac31d Fixed wall glitch with >1px making holes 2011-08-25 18:45:11 -04:00
Simon Robertshaw
caf0ee76e3 CO2, WIP 2011-08-25 23:06:05 +01:00
Simon Robertshaw
4421a92b59 Life diffusion for Acid 2011-08-25 22:18:42 +01:00
Simon Robertshaw
e06d68d63a Finally, water puts out fire 2011-08-25 22:10:24 +01:00
Bryan Hoyle
951a396e60 Added autorun option to tpt.getscript() 2011-08-25 11:14:27 -04:00
jacksonmj
a2ce9d6db7 Allow pixel scale selection of area to copy/stamp 2011-08-25 19:20:43 +08:00
Simon Robertshaw
e9331794bd Improvements to getscript 2011-08-25 12:20:00 +01:00
Bryan Hoyle
80e10460b8 Use HTTP instead of sockets 2011-08-24 13:09:21 -04:00
Bryan Hoyle
309ec4b07a Small ui for confirming script download as to make script downloads within scripts noticable 2011-08-24 11:44:16 -04:00
Bryan Hoyle
e120c9853f Changing server address for script repository 2011-08-24 11:06:51 -04:00
Bryan Hoyle
578144c48a Merge remote branch 'origin/master' 2011-08-23 20:29:26 -04:00
Bryan Hoyle
f577c319db Working tpt.getscriptid(<string: id>). Retrieves and runs a script from online 2011-08-23 20:28:55 -04:00
savask
021168ad1b Added "Tools" menu. 2011-08-23 23:45:01 +07:00
Simon Robertshaw
9bec43c45b Stray bracket, not cat+keyboard 2011-08-22 21:25:21 +01:00
Simon Robertshaw
42938cc2ea Lua keyevents bug, int keycode is cast to a char 2011-08-22 21:22:21 +01:00
Simon Robertshaw
ac6feec874 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-22 01:02:27 +01:00
jacksonmj
75cb924bd9 Fix electrode when in replace mode or specific delete mode 
Also fix bomb when SLALT != 0
 2011-08-22 01:02:02 +01:00
jacksonmj
54ee10936d Fix photons conducting heat to turned off HSWC 2011-08-22 07:53:28 +08:00
jacksonmj
d32ae818dc Make STKM spawn below PRTO (less likely to get stuck), and implement PROP_DEADLY 2011-08-21 02:37:26 +08:00
jacksonmj
5f8fba12c8 Change portal so that randomness never causes a particle to exit the same side it came in 2011-08-21 02:37:25 +08:00
jacksonmj
20aba663cd Fix STKM_init_legs and leg/head colours in prerender_save 2011-08-21 02:37:25 +08:00
Simon Robertshaw
27a95c7684 Make 'Molten x' a little safer 2011-08-20 18:23:27 +01:00
Simon Robertshaw
3ce69525ab Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-20 18:18:28 +01:00
Simon Robertshaw
99b67598aa Changes to unify mouse and keyboard events for Lua 2011-08-20 18:18:09 +01:00
savask
8a4ddb1c54 Made HUD display molten things as "Molten something" 2011-08-20 23:52:15 +07:00
Simon Robertshaw
03ee03ed1e Fix Coal invisibility when drawn on pause 2011-08-20 12:03:43 +01:00
jacksonmj
a96afc863e Stickman go through portals 2011-08-20 18:29:02 +08:00
Simon Robertshaw
7d283335d4 Menu scrolling for 'special' menu 2011-08-20 00:08:49 +01:00
Simon Robertshaw
2e2694e0fb Revert "Move version check out of main()" 
This reverts commit 97da8593d9.
 2011-08-19 23:44:09 +01:00
Simon Robertshaw
aa01aacebe Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-19 20:30:53 +01:00
jacksonmj
2bbfdc72fb Fix DEBUG_DRAWTOOL to work with line snapping 2011-08-19 20:30:32 +01:00
jacksonmj
7ae7d5fd56 Memory leaks and uninitialised value in catalogue_ui 2011-08-20 03:29:34 +08:00
jacksonmj
075bf06c71 Fix crash in prerender_save when STKM is near bottom of save 2011-08-20 03:29:34 +08:00
Simon Robertshaw
ac4ffb8d5d Fancy Coal effects 2011-08-19 17:53:56 +01:00
Simon Robertshaw
a85121d767 Allow reloading of opened files 2011-08-19 14:35:45 +01:00
jacksonmj
97da8593d9 Move version check out of main() 2011-08-19 13:55:07 +01:00
Simon Robertshaw
88823cf604 Reorganise a lot of Python console stuff 2011-08-19 13:16:49 +01:00
Simon Robertshaw
a94d249977 Fix save loading (enable replace mode) from the commandline, a bit of cleanup in main() 2011-08-19 12:28:09 +01:00
jacksonmj
961a393c7a Modify GBMB to only use life 
tmp not needed, since it doesn't create powder during an explosion like BOMB does.
 2011-08-19 12:23:38 +01:00
jacksonmj
34abbcc84c Prevent GBMB reacting with walls 2011-08-19 12:22:44 +01:00
jacksonmj
31b6e6a3cf Move multiple STKM loading check 2011-08-19 12:22:34 +01:00
jacksonmj
de820e36f8 Only do grav lensing when N-grav is on, and round coordinates correctly 2011-08-19 12:22:12 +01:00
Bryan Hoyle
161eb60cfa Added PGRV and NGRV for positive and negative gravity tools (sortof like air and vac, but with gravity) 2011-08-16 18:07:12 -04:00
Bryan Hoyle
16aa349e77 SPRK now makes electrons in WIRE 2011-08-16 16:12:43 -04:00
Bryan Hoyle
0cbf66a495 GBMB now has cool flicker graphics. 2011-08-16 15:22:11 -04:00
Bryan Hoyle
53d2c2d42f GBMB changes 2011-08-16 15:18:15 -04:00
Bryan Hoyle
d0291e73bc I'm an idiot, had to replace the blendpixel because I forgot about fire mode. 2011-08-16 14:51:59 -04:00
Bryan Hoyle
60c6aab523 Accedentally put in a blendpixel, it is now removed 2011-08-16 14:44:48 -04:00
Bryan Hoyle
e55e52c460 added gbmb which is an element that makes large amounts of gravity when it hits a particle 2011-08-16 14:39:50 -04:00
Bryan Hoyle
e7ce51d420 Revert "Fixed a bug with clne having its ctype overridden by manually placed particles." 
This reverts commit ed392c9724.
Sorry about the reverts, I accedentally reverted the wrong one originally.
 2011-08-16 12:46:45 -04:00
Bryan Hoyle
ad09f3040e Revert "Revert "added lua command: tpt.setfpscap(int FPSCap)"" 
This reverts commit a5db1d53da.
 2011-08-16 12:45:44 -04:00
Bryan Hoyle
a5db1d53da Revert "added lua command: tpt.setfpscap(int FPSCap)" 
This reverts commit aa56eca5c0.
 2011-08-16 12:43:50 -04:00
Bryan Hoyle
ed392c9724 Fixed a bug with clne having its ctype overridden by manually placed particles. 2011-08-16 12:38:12 -04:00
Bryan Hoyle
aa56eca5c0 added lua command: tpt.setfpscap(int FPSCap) 2011-08-15 21:44:37 -04:00
Simon Robertshaw
dcd3af9440 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-14 18:32:10 +01:00
Simon Robertshaw
d3153aae85 Extended info for line drawing 2011-08-14 18:31:48 +01:00
Bryan Hoyle
ca66525bea I thought Rand_max was smaller, fixed h2 burn temp down to about 2200 Celcius instead of 9000... 2011-08-12 12:25:16 -04:00
Bryan Hoyle
89605f3deb More realistic H2/air burn temp 2011-08-12 12:21:24 -04:00
Bryan Hoyle
acebad0744 Made the WTVR coolign only for teh H2/O2 reaction (To keep save compatavbility) 2011-08-12 12:18:41 -04:00
Bryan Hoyle
345c183ee3 Merge remote branch 'origin/master' 2011-08-12 12:08:12 -04:00
Bryan Hoyle
8824bcc609 Made wtrv cool down over 1000 C 2011-08-12 12:08:05 -04:00
savask
f1908bab0c Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-12 23:01:01 +07:00
Bryan Hoyle
6cdffe9cc2 Merge remote branch 'origin/master' 2011-08-12 11:57:23 -04:00
Bryan Hoyle
f5cb03d424 Realistic burn temp for O2 and H2 reaction ~~3200 Celcius 2011-08-12 11:56:52 -04:00
Simon Robertshaw
2749285134 LCRY can be coloured by decoration tool 2011-08-12 16:54:44 +01:00
Simon Robertshaw
62bd61edae Better graphics for H2 and O2 2011-08-12 16:34:20 +01:00
Simon Robertshaw
2d7c75c026 More fancy debug 2011-08-12 16:15:42 +01:00
savask
86e9a6eeff Fixed a bug where you were able to create multiply stickmans by copying it. 2011-08-12 14:52:02 +07:00
savask
d31b140f8e Fixed my mistake in names. 2011-08-12 14:51:25 +07:00
savask
15dab3daad Imporved walking in a gravity field. 2011-08-12 14:51:05 +07:00
savask
65c8e27538 New walking code (WIP) 2011-08-12 14:50:41 +07:00
savask
fd38838b51 Added a recoil when stick man is spawning. 2011-08-12 14:49:39 +07:00
savask
c37f3b1eba New stick mans collisions code. 2011-08-12 14:49:20 +07:00
Simon Robertshaw
d5435c50a9 Debug info for particles allocation 2011-08-11 20:12:52 +01:00
Simon Robertshaw
4f8720eecc OS X doesn't like the 'd' suffix 2011-08-11 17:10:38 +01:00
Simon Robertshaw
0938b561e6 Missing file from previous commit 2011-08-11 14:41:43 +01:00
Simon Robertshaw
9e634b95cc Fire intensity from Lua 2011-08-11 13:02:00 +01:00
jacksonmj
806e1933a2 Fix segfault when there are no unused particles before parts_lastActiveIndex 2011-08-11 18:49:42 +08:00
jacksonmj
2e323ea018 Update parts_lastActiveIndex when creating neut/phot 2011-08-11 07:38:56 +08:00
jacksonmj
1713604233 Skip unused particles at end of parts[] 2011-08-11 07:38:56 +08:00
Simon Robertshaw
61bbc36cfa Fix Gol with Wire placed 2011-08-08 16:19:23 +01:00
Simon Robertshaw
950f5c34a3 Save Wire ctype 2011-08-08 15:14:11 +01:00
Simon Robertshaw
9b9d628374 Improvements to Wire 2011-08-08 14:57:32 +01:00
lieuwe
dd2d06425e you can now charge WIRE with pscn and it'll create only one 
electron.
 2011-08-08 20:37:28 +08:00
lieuwe
b1b3fbbc20 added some metl->wire interaction, still working on wire->metl 2011-08-08 20:35:03 +08:00
lieuwe
8f92829aab IT WOOOOOORKS :D (fixed WIRE logic.) 2011-08-08 20:32:53 +08:00
lieuwe
50c4bfd86d Y U NO WORK. added logic for WIRE but it's not being called. 2011-08-08 20:32:04 +08:00
jacksonmj
39e1ffe5bf 0 is a valid menu number (walls) 2011-08-06 18:13:22 +08:00
jacksonmj
75d7853a74 Fix persistent mode photon lines bug 2011-08-06 18:13:22 +08:00
jacksonmj
788b0cd04c Calculate Newtonian gravity using fast Fourier transforms 
About 16% slower for one cell changing, same speed for 6 cells changing,
and several hundred times faster for whole screen changing.
 2011-08-06 18:13:22 +08:00
cracker64
83e4f885da Added tmp2 for tpt.get_property and tpt.set_property 2011-08-06 00:16:30 -03:00
Simon Robertshaw
6dedc28517 Ensure renderer doesn't create new threads for gravity simulattion, since it doesn't use it 2011-08-05 21:07:30 +01:00
Simon Robertshaw
4ebe56f65c Mouse and keyboard events, replace luaL_openlib() with luaL_register() and move mousex and mousey out of the global table and into the 'tpt' table 2011-08-05 14:54:24 +01:00
Simon Robertshaw
98b6c4b001 Revert "allowed secret menu via lua" 
This reverts commit 6c8d62389c.
 2011-08-04 16:38:07 +01:00
me4502
6c8d62389c allowed secret menu via lua 2011-08-04 14:09:24 +10:00
Simon Robertshaw
ac2912f2d2 Ensure menu ID is valid for active_menu 2011-08-01 11:52:01 +02:00
Simon Robertshaw
8dfa09bf6a Edited src/luaconsole.c via GitHub 2011-08-01 10:59:33 +02:00
Simon Robertshaw
500cfc3746 Lua has a garbage collector, it may dispose of strings while we're using them, make throw_error a little more safe 2011-07-31 12:26:51 +01:00
Simon Robertshaw
f51fe2c983 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-07-31 12:20:16 +01:00
Bryan Hoyle
d7a55f1f50 me4502 added tpt.throw_error and tpt.heat as lua commands 2011-07-30 20:31:34 -04:00
Simon Robertshaw
3bd5a4711c Less buggy DLAY 2011-07-27 14:28:32 +01:00
Simon Robertshaw
58d96de4ce Revert "DLAY element" 
This reverts commit 7338545ab4.
 2011-07-27 13:07:41 +01:00
Simon Robertshaw
eecf5ad352 Revert "DLAY temp fix" 
This reverts commit 108e5643d7.
 2011-07-27 13:07:23 +01:00
Simon Robertshaw
6fbf48f2e6 Revert "DLAY temp, actually fixed :D" 
This reverts commit 94e316af85.
 2011-07-27 13:07:05 +01:00
jacksonmj
0f585011fb Fix for SPWN sometimes failing to create stickman 
Example: place stickman, then load a save containing SPWN but no stickman.
Stickman does not get created.
 2011-07-26 18:28:23 +01:00
jacksonmj
cbe1e0b073 Fix LIFE sampling and HUD 2011-07-26 18:28:06 +01:00
jacksonmj
647e29a31a Fix LIFE graphics in blob, nothing and fancy view 
And some small fixes for switchable element colours
 2011-07-26 18:27:56 +01:00
jacksonmj
db5cb5e2f9 Minor optimisations for startup and render_fire 2011-07-27 01:25:34 +08:00
tridiaq
94e316af85 DLAY temp, actually fixed :D 2011-07-27 01:24:09 +08:00
tridiaq
108e5643d7 DLAY temp fix 2011-07-27 01:14:59 +08:00
Simon Robertshaw
899969cc8a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-07-26 17:46:15 +01:00
tridiaq
7338545ab4 DLAY element 2011-07-26 17:05:20 +01:00
savask
dbd3272933 Generalized stick man's update functions. Got rid of some unnecessary 
variables.
 2011-07-25 12:47:38 +07:00
Simon Robertshaw
e7907f9ea3 Prevent gravity vel-maps from flipping when paused 2011-07-24 14:31:24 +01:00
Simon Robertshaw
fbb72e4f32 Slight speed improvements for lensing 2011-07-24 14:26:32 +01:00
jacksonmj
7808059453 Fix infinite dialogs when unable to open a save from the website 2011-07-24 20:10:43 +08:00
jacksonmj
aeaaa1c4da update_air now runs 10% faster 2011-07-24 20:10:43 +08:00
jacksonmj
89cc8d4ded Fix life cloning 2011-07-24 20:10:43 +08:00
jacksonmj
7ed0255f04 Disable old life elements 2011-07-24 20:07:15 +08:00
jacksonmj
ae9fca86ee Update gravity mask when deleting gravity wall 2011-07-24 20:07:15 +08:00
jacksonmj
f8d60b14d2 Avoid division by zero for circle brush 2011-07-24 20:07:15 +08:00
jacksonmj
c35a8e45ee Fix liquids in vertical gravity when Newtonian gravity is turned on 2011-07-24 20:07:14 +08:00
tridiaq
38c920714c Fix 2011-07-24 20:02:08 +08:00
cracker64
2f714606d7 active menu and hud enable are global. 2011-07-22 10:08:13 -04:00
cracker64
c5a8138dc9 Fix new luaconsole functions. 2011-07-22 06:51:29 -07:00
cracker64
f064227b7a me4502 luaconsole functions, edited from github. 2011-07-22 06:47:43 -07:00
Simon Robertshaw
68404608f6 Lensing effect for gravity, adds 3 new gravity maps (full resolution, linear interpolation for faux accuracy), old ones should be removed in time. 2011-07-18 23:58:08 +01:00
Simon
0fbe6e2d3f Fix PBCN saving and increment major version 2011-07-13 12:03:30 +01:00
Simon Robertshaw
68f2310d2d Allow flood_parts to cope with Life types 2011-07-12 14:03:01 -07:00
jacksonmj
02848f9e0c Fix scaling bug when drawing lines 2011-07-13 04:57:40 +08:00
Simon Robertshaw
4c685c7665 Revert variable names for Brush 2011-07-12 19:06:59 +01:00
Simon Robertshaw
965810d5e3 Merge 2011-07-12 18:49:18 +01:00
Cate
4efa60009e Some letters changed and formatting fixed. n_n 2011-07-12 18:47:56 +01:00
Cate
d3452b01c8 OMG FIXES. Lots of fixes for triangle brush to make sure it works, from Cracker. Edited CLST to prevent "popcorning" when its float hits weird numbers. Also fixed it so it freezes nicely when cooled. Fingers are back! :DDD 2011-07-12 18:46:33 +01:00
Simon Robertshaw
7480442c67 Move SING back to where it belongs, acid heats up when dissolving materials 2011-07-12 18:10:10 +01:00
Cate
e17a2a0b03 Added blunt temperature controls to CLST that cause it to freeze in place when cooled by cohesion. Doesn't produce the exact same finger shapes as before for some arcane reason, I seriously have no clue why. But looks close enough for passing. 2011-07-13 00:43:17 +08:00
Cate
45fe00bef9 Added Cracker changes for adding a triangle brush! :DDD Seems to work without any issues. 2011-07-12 23:29:22 +08:00
Simon Robertshaw
d7053422f1 fix potential crashes with LIFE - jacksonmj 2011-07-12 06:54:47 -07:00
Simon Robertshaw
aaaed342ef Fix cursor rendering and some potential crashes for LIFE, courtesy of jacksonmj 2011-07-12 06:51:47 -07:00
jacksonmj
1be79e581d Line snapping (hold down Alt when drawing a line) 
Specific element select changed to Ctrl+Alt
 2011-07-12 21:48:54 +08:00
jacksonmj
726acc96a0 Fix line/box erase for decor layer 2011-07-12 21:47:42 +08:00
jacksonmj
52b4473f0f Fix bounds check for WIND line 2011-07-12 21:47:41 +08:00
Cate
0ce4104c7a Added CLST element, which is Clay dust, for making concrete with water. :D Neat due to element cohesion with itself, which causes it to sludge downwards in a way very uncharacteristic of any current powder. Cohesion is very easy to modify. Thanks to Savask for help with cohesion code. :D 2011-07-12 21:00:21 +08:00
Cate
7036af066b Fixed quartz colors due to missing Else before an If in graphics.c Thanks Savask. :D (I would have moved ifs around in a much less pleasant way @_@;) 2011-07-12 21:00:20 +08:00