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

1097 Commits

Author SHA1 Message Date
Simon Robertshaw
29efbcaa3a Glow, Fire, Smoke, blob and flat particle effects in OpenGL 2011-10-20 00:34:31 +01:00
jacksonmj
034cd4ed62 FILT subtracts photon colours when tmp=3 2011-10-19 17:47:40 +08:00
jacksonmj
9fed467a28 Fix infinite temperatures 
May also need -fno-finite-math-only, but it works fine for me without it
 2011-10-19 17:47:39 +08:00
Simon Robertshaw
8052c4bfdf Some testing with OpenGL 2011-10-18 21:56:32 +01:00
Simon Robertshaw
7d9d504abf Debug performance/time graph 2011-10-17 00:28:01 +01:00
Simon Robertshaw
44a0008d4e Debug performance/time graph 2011-10-17 00:16:43 +01:00
Simon Robertshaw
f9883b31e0 Reset emp-decor if out of bounds 2011-10-14 18:08:06 +01:00
jacksonmj
3f4d55fbcc Remove unused pixel buffer 2011-10-15 01:05:01 +08:00
jacksonmj
633c3da401 Fix crash with abnormal ICE ctype 2011-10-15 01:04:59 +08:00
jacksonmj
8e877594c9 Allow STKM to use lightning 2011-10-15 01:04:58 +08:00
Simon Robertshaw
37e15bf3ad Replace use of gravy and gravf with gravxf and gravyf 2011-10-14 13:18:00 +01:00
Simon Robertshaw
1af0a86e0d Prevent integer overflow with emp_decor 2011-10-14 12:12:27 +01:00
Simon Robertshaw
56764a2309 Prevent integer overflow with emp_decor 2011-10-14 12:11:09 +01:00
Simon Robertshaw
bbe5aabf4f Allow use of OpenGL enabled surface for future use 2011-10-13 22:25:06 +01:00
jacksonmj
af21bcd353 Some changes to LIGH/EMP/TESC based on changes in MaksProg's mod v0.3 
Weaker and shorter EMP flash.
TESC has correct tmp value when created with replace mode.
LIGH harms STKM.
Gravity affects LIGH in create_part if p==-2, instead of in update_LIGH,
so that TESC lightning is not affected by gravity.
 2011-10-14 00:33:22 +08:00
jacksonmj
9dc154f1f1 Fix gravity occasionally not working 2011-10-14 00:33:21 +08:00
jacksonmj
fc4836e69b Don't heat elements which don't conduct heat 2011-10-14 00:33:21 +08:00
jacksonmj
2f46dca7c1 Some work on DEST, EMP, LIGH 
Change indentation to tabs, respect temperature limit (if a hotter
reaction is required, should raise temp limit instead of ignoring it).

DEST: fix TYPE_SOLID check, and prevent it displacing DMND
EMP: randomise DLAY delay instead of heating it (since DLAY does not melt
and does not transfer heat)

Fix nearest_part so that t=-1 does not include dead particles
 2011-10-14 00:33:20 +08:00
jacksonmj
107e77a1a1 Prevent extra particles at the end of 1px lines 2011-10-14 00:33:20 +08:00
Simon Robertshaw
7a62500eb3 Implement remaining graphics functions for particles 2011-10-12 18:40:00 +01:00
Simon Robertshaw
2cf9ef60aa Implement more particle graphics 2011-10-12 12:37:04 +01:00
Simon Robertshaw
0e61956b24 Improved 'GLOW' rendering 2011-10-11 18:54:38 +01:00
Simon Robertshaw
8dad37bf00 New part rendering completed 2011-10-11 18:35:26 +01:00
Simon Robertshaw
6178bb4605 Fixes for LIGH and TESC, LIGH observes gravity setting 2011-10-11 10:34:33 +01:00
Simon Robertshaw
e1cd3cc180 Fix erronous assignment and add MaksProg to contributors list 2011-10-11 00:25:43 +01:00
Simon Robertshaw
fd71675b69 Add missing file from previous commit 2011-10-10 23:59:44 +01:00
Simon Robertshaw
40457bf652 Fix crash with LIGH 2011-10-10 23:58:50 +01:00
Simon Robertshaw
a87407f0df More functionality for LIGH, better english on element descriptions 2011-10-10 23:55:42 +01:00
Simon Robertshaw
bf8258ee30 Elements, LIGH, TESC, EMP and DEST thanks to MaksProg 2011-10-10 23:41:19 +01:00
Simon Robertshaw
2901eefa32 Smoke Graphics 2011-10-10 22:01:10 +01:00
Simon Robertshaw
948fd376b4 Starting on jumptable/function pointers for graphics, only FIRE is implemented 2011-10-10 20:42:55 +01:00
Simon Robertshaw
9c9f6b2287 Send user authentication for update downloads 2011-10-10 17:28:15 +01:00
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