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

1115 Commits

Author SHA1 Message Date
Simon Robertshaw
ee47b2dd68 Pretty effect when drawing powders, activate with 'n' 2011-10-09 13:55:16 +01:00
jacksonmj
cb30cbcce7 Fix typo allowing liquids to teleport through solids 2011-10-07 20:18:07 +01:00
Simon Robertshaw
d7138d6e4a Make installer set data dir to current dir, for now. 2011-10-06 22:12:35 +01:00
jacksonmj
4abefaf1ec tpt.drawline 2011-10-06 21:59:41 +01:00
jacksonmj
ae3241ec80 Fix WHOL/VENT not eating ANAR, and fix PVOD eating PHOT/NEUT when off 2011-10-07 04:57:09 +08:00
Simon Robertshaw
3e88325632 Missed some changes from previous fix 2011-10-01 20:18:07 +01:00
Simon Robertshaw
5ded009ffd Fix bug with drawing rectangles outside the game region 2011-10-01 20:11:27 +01:00
Simon Robertshaw
fd7120425d Changes to QRTZ scattering 2011-10-01 18:18:53 +01:00
Simon Robertshaw
218c14c5ea Better scattering for QRTZ 2011-10-01 17:59:52 +01:00
Simon Robertshaw
18990e9746 Logout is saved to prefs 2011-09-30 18:00:32 +01:00
Simon Robertshaw
b20e1c5e13 Fix bug causing logins to be lost when The Game is closed. 2011-09-30 17:41:02 +01:00
jacksonmj
203db57e57 Prevent segfault with high tmp values for pipe 2011-09-30 14:16:48 +01:00
Simon Robertshaw
f5a9f43b77 Added extra functions to FILT (determined by tmp, modes are convert, filter and add, convert is default). Added property edit tool, changes the properties of materials 2011-09-30 13:57:32 +01:00
Simon Robertshaw
1759d0bd46 Make photons less green, green was given 2 extra bits by Skylark, not sure if this was intentional or not. 2011-09-30 10:50:46 +01:00
Simon Robertshaw
311d3ef6c1 Added crappy scattering for qrtz 2011-09-29 23:14:36 +01:00
Simon Robertshaw
3ed24d084e Freeing "filename" here would cause problems as everything is taken care of later on. 2011-09-29 19:09:31 +02:00
atlaua
946a492745 Bugfix: Fixed a segmentation fault in confirm_ui() 
confirm_ui() free()ed its msg. This resulted in attemps to free const
strings or and to invalid memoory accesses (because some other functions
wanted to reuse the parameter which they gave to confirm_ui() after
calling this function).

Resolved by removing the call to free() from confirm_ui() and adding it
after the calls to confirm_ui(9, if necessary.
 2011-09-29 18:54:32 +02:00
Simon Robertshaw
3ecb2ee39b Add JSON parser file (cJSON) and move preference saving to JSON format 2011-09-27 18:44:35 +01:00
Simon Robertshaw
a6e71ab3f5 Fix potential issue with argument ordering 2011-09-27 14:17:36 +01:00
Simon Robertshaw
d788b15068 Ensure installation doesn't fail if directory already exists 2011-09-27 12:49:11 +01:00
jacksonmj
820871e92b Fix lighten/darken tools so they work with different display pixel formats 2011-09-26 23:53:37 +08:00
Simon Robertshaw
1be8ce6c5d Fix small error 2011-09-25 10:33:49 +01:00
Simon Robertshaw
4514c5e619 Make changes to prefs file regarding build_num and updated 2011-09-24 17:13:28 +01:00
Simon Robertshaw
5a824850b3 Detect updates by build number, make confirm box autosize, also fix bug where config file is read before data dir is set (Therefore reading the wrong file) 2011-09-24 16:57:01 +01:00
Simon Robertshaw
59a134d5f1 Send session/auth info with update checks 2011-09-24 15:10:21 +01:00
cracker64
789049b269 Can see selected elements from Lua, tpt.selectedl or tpt.selectedr 2011-09-23 23:25:50 -04:00
Cate
c750e659a7 Decreased pressure cap on ambient fizzling from 5 to 3. Due to ambient pressure decrease in Air.c, carb water has trouble reaching this. Looks better when released at 3 anyhow. 2011-09-24 04:04:08 +08:00
Cate
026e613ac6 One If added to Carb water that always explodes when under -0.5 pressure. Even strong explosions don't seem to cause this when water's held in containers, which -should- limit this to vacuum or wind effects. Still testing with. 2011-09-24 04:04:08 +08:00
cracker64
07f8087907 Prevent water equalization from moving onto particles. 2011-09-23 10:17:41 -04:00
Simon Robertshaw
24b4478136 Added Caustic gas, similar to acid, created with acid and water vapour 2011-09-23 12:48:24 +01:00
Simon Robertshaw
8b9a0b663f Change some Win32 includes to lower case filenames for Linux cross compiling 2011-09-22 19:25:21 +02:00
Cate
39525e6ef0 Fixes to carbonated water explosions. Help from cracker with create_part making overlapping particles to fix CO2 emitting water (as a bit of a sneaky trick to make less overlapping water.) Carb water slowly increases pressure if sealed, causing explosions when released. 2011-09-23 01:11:57 +08:00
Cate
3ac14d94e7 Corrected changes to appear properly. I think. Added Explosions with pressure to carbonated water. 2011-09-23 01:11:57 +08:00
cracker64
848fa77a82 Fix walls with water equalization. 
Also annoying inlines for visual studio.
 2011-09-21 22:05:19 -04:00
cracker64
eb646ce1d6 Forgot luaconsole.c changes 2011-09-21 18:52:08 -04:00
cracker64
a73fc9db06 Water level equalization test! In options menu, or tpt.watertest() . 2011-09-21 18:36:35 -04:00
Simon Robertshaw
c3d7f694f2 Make soap clean off decoration (opposite of BIZR) 2011-09-21 12:41:52 +01:00
cracker64
b926341d80 Merge remote-tracking branch 'origin/master' 2011-09-19 17:05:05 -04:00
cracker64
f0379c5418 Tool menu in deco editor, Lighten/Darken tools. 2011-09-19 17:02:04 -04:00
Simon Robertshaw
f535f8dce4 Game installer launches game with data directory for Windows (AppData) 2011-09-19 21:31:10 +01:00
Simon Robertshaw
23dcec9d07 Allow setting of application data path \(For config, save and script data\) 2011-09-19 20:05:15 +01:00
cracker64
fb1a522cca Deco editor improvements. Editable color text boxes! Hit enter when done editing. 2011-09-19 12:31:14 -04:00
me4502
1403bd17f9 added dcolour to set and get 2011-09-19 03:50:05 +08:00
jacksonmj
baef6f20c2 Fix disappearing particles, e.g. with a box of CONV (ctype DEUT) containing neutrons 2011-09-19 03:49:45 +08:00
Simon Robertshaw
cf9b36d3db Fix bug where mouse events are confused after breaking out of a mouse down event 2011-09-18 20:47:10 +01:00
Simon Robertshaw
16ae9a9b59 Small changes to STOR, prevent setting Ctype to solid from cursor, allow any type when ctype not set and correct discharge location bias 2011-09-10 19:37:33 +01:00
Simon Robertshaw
49a164b7ba Fix various memory leaks, as noted by Merkil/cppcheck 2011-09-10 13:33:24 +01:00
Simon Robertshaw
63dd1cfd4b Add energy-only wall and make STOR show when it's holding a particle 2011-09-08 11:54:50 +01:00
jacksonmj
69a5bc5440 Fix bottom right selection box corner (did not appear directly under cursor) 2011-09-08 18:31:24 +08:00
jacksonmj
89ff8ad9aa tpt.get_property("id",x,y) 2011-09-08 18:31:24 +08:00
jacksonmj
5892c74595 Visual Studio fixes 2011-09-05 08:40:17 +08:00
Simon Robertshaw
f35be3db02 Update contributors 2011-09-03 14:46:48 +01:00
Simon Robertshaw
456a8df31e Convert Element 2011-09-03 14:41:07 +01:00
Simon Robertshaw
ea68100724 Added Powered Void 2011-09-03 14:06:36 +01:00
jacksonmj
d6d40f88d1 Fix crash when stickman goes through a portal 2011-09-02 18:39:15 +08:00
jacksonmj
180d3ea60f Limit particle-air heat transfer rate 2011-09-02 18:39:14 +08:00
Simon Robertshaw
d84abca852 Improvements to CBNW and BIZR act as a dye 2011-08-30 13:44:18 +01:00
jacksonmj
a7ede2659a Allow decoration layer to affect firework explosion colour 2011-08-30 19:34:28 +08:00
jacksonmj
741014770c Add tpt.setwindowsize(scale, fullscreen) 2011-08-30 19:34:28 +08:00
jacksonmj
e506934655 Always check bmap when creating particles 2011-08-30 19:34:28 +08:00
jacksonmj
df504330e2 Fixes: HUD for fast PIPE, PIPE contents disappearing when next to walls, scrolling special menu, and parts_lastActiveIndex 2011-08-30 19:34:28 +08:00
Simon Robertshaw
323f3c1415 Save ctype of STOR, also Version Increment 2011-08-30 01:02:41 +01:00
Simon Robertshaw
26269ff052 Added STOR, a block that can store a single particle and release when charged 2011-08-29 16:34:53 +01:00
Simon Robertshaw
9c458b8851 Some element interactions for CBNW and CO2, also fixes Gas only wall 2011-08-29 13:34:59 +01:00
jacksonmj
65445c51f1 Fix rapid decrease in pressure with GAS/NBLE 2011-08-29 19:28:11 +08:00
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