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

1427 Commits

Author SHA1 Message Date
Simon Robertshaw
b71214b8cf MSVC compatibility 2011-11-04 21:33:44 +00:00
Simon Robertshaw
6615fbca03 Fix shader compilation for ATi and Intel 2011-11-04 20:07:51 +00:00
atlaua
ae26ecaf8d Prevented a malloc-related problem in interface.c from occuring. 2011-11-03 19:25:49 +01:00
atlaua
e084d91b55 Resolved a todo in main.c 2011-11-03 14:24:20 +01:00
Simon Robertshaw
cfb8ec7af5 Error logging for shader compilation 2011-11-02 20:24:04 +00:00
Simon Robertshaw
640d4e9e3a Fix Air inversion 2011-11-02 19:37:52 +00:00
savask
7de6526a1e CAUS now kills stick man. Also stick mans can have gas power now. 2011-11-02 22:22:27 +07:00
Simon Robertshaw
9c26ef45b6 OpenGL headers for OS X in graphics.c 2011-11-02 10:39:48 +00:00
Simon Robertshaw
3723147a1d ACEL and DCEL, need to be in a better section 2011-11-01 20:44:49 +00:00
Simon Robertshaw
b0458bd5fa OpenGL on Windows 2011-11-01 19:29:13 +00:00
savask
98e23875c8 Fixes for stick mans in heat mode. 2011-11-01 23:44:44 +07:00
savask
9ac04e2c18 Right color for air stick man. 2011-11-01 23:44:31 +07:00
savask
3e5fb5942d Made fighters shoot anything deadly. 2011-11-01 23:44:17 +07:00
savask
8e00d07f35 Some works on FIGH's AI. 2011-11-01 23:44:02 +07:00
Simon Robertshaw
6de8346cdb Fix Wireworld graphics 2011-11-01 13:35:18 +00:00
Simon Robertshaw
241a12104b Fix scaling, no runtime scale switching yet :( 2011-11-01 13:21:47 +00:00
Simon Robertshaw
a9046fe7a6 OpenGl Improvements 2011-11-01 11:42:44 +00:00
Simon Robertshaw
ec3fdfed1c Deco apply to fire mode 2011-10-31 21:57:13 +00:00
Simon Robertshaw
c26cfa29c2 LCRY tweaks 2011-10-31 15:35:27 +00:00
Simon Robertshaw
4124738a0e Electrons Hydrolysis. 2011-10-30 21:13:33 +00:00
Simon Robertshaw
856f9574b6 Change LCRy workings and add ELEC (wip) 2011-10-30 16:22:33 +00:00
Simon Robertshaw
3daf9e1e29 Fix nothing display and LCRY with decoration 2011-10-29 21:21:30 +01:00
Simon Robertshaw
f4b6cbf34d Fix passing of PMODE_GLOW into Heat display 2011-10-29 15:55:42 +01:00
Simon Robertshaw
52fd083db4 Persistent display for OpenGL 2011-10-29 13:46:14 +01:00
Simon Robertshaw
a2d1ed0bac Diamond head for Fighter 2011-10-29 12:25:40 +01:00
Simon Robertshaw
4bfb65d247 Ensure grav vel maps are cleared when stopping/starting gravity calculation 2011-10-29 00:29:01 +01:00
Simon Robertshaw
a7191ce9e7 Whoops, fix PMODE_BLEND to use correct function, also fix BRAY del mode 2011-10-29 00:11:27 +01:00
Simon Robertshaw
e46f26684b Fix Life and heat display, implement alpha, blend and add, fix FILT, INVS and BRAY + others 2011-10-28 23:48:57 +01:00
Simon Robertshaw
7413654b9f Fix Blob mode, Sprk, Firw, Fwrk and others 2011-10-28 22:36:37 +01:00
Simon Robertshaw
228e79eb4f Fix graphics for Phot, Fire, Stor 2011-10-28 22:10:05 +01:00
Simon Robertshaw
a101353681 Make smoke a little less dark 2011-10-28 21:54:10 +01:00
Simon Robertshaw
ed75259f54 Fix H2+O2 Plasma that doesn't make water 2011-10-28 21:53:21 +01:00
Simon Robertshaw
5ab1ab8b46 Fix FIGH loading and bad variable names 2011-10-26 21:34:24 +01:00
Simon Robertshaw
e2c9882692 Merge latest FIGH additions 2011-10-26 17:10:21 +01:00
Simon Robertshaw
60de1cf575 Fix graphics.c 2011-10-26 16:24:54 +01:00
Simon Robertshaw
e3a7b626ab Revert "Revert "F1 to bring up intro message"" 
This reverts commit 8c25ef733c.
 2011-10-26 16:05:23 +01:00
Simon Robertshaw
8c25ef733c Revert "F1 to bring up intro message" 
This reverts commit f8d54e66db.
 2011-10-26 16:03:05 +01:00
savask
03902ec9a4 Made a special structure for stick mans. 2011-10-26 15:36:00 +01:00
savask
5652ecc5c2 Some work on lightning for stick mans and fighters. 2011-10-26 15:35:00 +01:00
savask
a075fd5a9a Fix one merging error, and adjusted fighters' array. 2011-10-26 15:34:54 +01:00
savask
573bda0950 Added a simple AI to fighters. 2011-10-26 15:34:02 +01:00
savask
1eef119fdb Made stick mans' deadly check better. 2011-10-26 15:33:03 +01:00
savask
00d604820d Added fighters. 2011-10-26 15:31:55 +01:00
Simon Robertshaw
4742c1bcd9 Fix compilation with OpenGl disabled 2011-10-26 15:03:14 +01:00
Simon Robertshaw
18ca4024c1 Remove references to python console 2011-10-26 14:55:26 +01:00
Simon Robertshaw
e46ef289e1 Remove Python console stuff 2011-10-26 14:50:50 +01:00
Simon Robertshaw
ef7e231a32 Half-working persistent mode 2011-10-25 16:10:16 +01:00
Simon Robertshaw
b9ec7d8654 Fix another blending issue and search_ui display clearing 2011-10-25 16:00:52 +01:00
Simon Robertshaw
565a3e10e4 Fix EMP flash 2011-10-25 15:45:16 +01:00
Simon Robertshaw
48ad01f2ff Fix for odd alpha blending partsTex 2011-10-25 13:42:17 +01:00
Simon Robertshaw
cb537351e7 Fixes to EMP and speed/zoom for FBO texture 2011-10-25 12:13:32 +01:00
Simon Robertshaw
07a1f21df4 Merge latest with graphicstest 2011-10-25 11:31:21 +01:00
Simon Robertshaw
f01056ee02 Spark graphics change and disable lensing for non-fancy displays 2011-10-25 09:17:11 +01:00
Simon Robertshaw
506ab6ea0e Cursors for OpenGL, Coords are a bit off, which is annoying and I cannot draw to parts FBO because It's already been rendered D:< 2011-10-25 00:16:57 +01:00
Simon Robertshaw
f8d54e66db F1 to bring up intro message 2011-10-24 19:05:03 +01:00
Simon Robertshaw
f86793ceb1 Draw version info with outline 2011-10-24 18:46:58 +01:00
Simon Robertshaw
c3b9c698d2 Prevent UI text from overlapping intro message 2011-10-24 18:43:45 +01:00
Simon Robertshaw
8f91f948c1 Generate fire/plasma gradients at runtime, makes editing easier 2011-10-24 17:20:18 +01:00
Simon Robertshaw
89fd306ba1 Fix unitialised variable 'bc' in main.c 2011-10-23 18:37:25 +01:00
Simon Robertshaw
b04c20e747 More MSVC fixes 2011-10-23 18:24:51 +01:00
Simon Robertshaw
0a8f65b2cf Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-10-23 17:59:25 +01:00
Simon Robertshaw
b549688fdd Compatibility with MSVC - devast8a 2011-10-23 17:59:04 +01:00
Simon Robertshaw
66fd41673b Fix compilation for Non-OpenGL builds 2011-10-23 17:37:24 +01:00
Simon Robertshaw
2d25d944ad Spark, Flare and LFlare effects. Pretty bad (need to make use of instancing) but works for now 2011-10-23 17:22:14 +01:00
Simon Robertshaw
1c7b9d9949 Pass particle pointer to graphics update function instead of index. Make PIPE use subcall to get graphics info. Cache for particle graphics properties. Stickman PSPEC_STICKMAN added and implemented 2011-10-23 13:52:26 +01:00
jacksonmj
05eb16e14c Fix LIGH overwriting fire_alpha 2011-10-23 17:54:29 +08:00
Simon Robertshaw
84522d2594 Fix Options meny in scale:2 and make tooltip more readable 2011-10-22 19:39:24 +01:00
Simon Robertshaw
014c1fbad6 Embed shaders 2011-10-22 19:24:32 +01:00
Simon Robertshaw
ba59ba8b7c Fix Air vel display 2011-10-22 17:33:04 +01:00
Simon Robertshaw
abb1a12271 Finish Zoom 2011-10-22 14:41:14 +01:00
Simon Robertshaw
5b4aeaed01 Zoom WIP 2011-10-22 10:45:44 +01:00
Simon Robertshaw
7ed4ad2fd8 Gravlensing for OpenGL 2011-10-21 23:38:48 +01:00
Simon Robertshaw
9cf65de1c3 Quick options menu 2011-10-21 19:41:12 +01:00
Simon Robertshaw
57f6ac0f3a Use FBO for parts rendering 2011-10-21 18:21:22 +01:00
Simon Robertshaw
08009ebbaa Screenshot for lua 2011-10-21 17:37:26 +01:00
Simon Robertshaw
c1eb40af61 Fix gravity field drawing 2011-10-21 17:25:14 +01:00
Simon Robertshaw
e6d4073f5b Use FBO for particles 2011-10-20 22:22:18 +01:00
Simon Robertshaw
eaafcaeecc Better fire for Non-Fire display modes 2011-10-20 16:51:38 +01:00
Simon Robertshaw
09d3cacf9c Implement Blur mode and embed shaders 2011-10-20 16:28:49 +01:00
Simon Robertshaw
2b56d31610 Rendering, Glow and UI alpha fixes 2011-10-20 15:37:21 +01:00
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
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
Simon Robertshaw
d42e06f37a Merge all GOL types into PT_LIFE, behaviour is determined by ctype 2011-07-09 18:22:25 +01:00
Cate
d2eb6f1cb3 Deleted whole repository due to weirdness with recognizing folder. From current source, added Cracker64's changes that make 1px pipe several times faster than thicker pipe. Doesn't break saves. :D 2011-07-08 18:09:16 +01:00
Simon Robertshaw
5f62bc74c9 Windows clipboard_pull_text() implementation (untested) 2011-07-06 14:01:47 +01:00
Simon Robertshaw
82a05ddd3c Remove define for Linux Clipboard 2011-07-06 13:48:09 +01:00
jacksonmj
34774e7829 Basic clipboard_push_text support for linux 2011-07-06 13:43:51 +01:00
Simon Robertshaw
3dd82d9ced Better favourite removal and download counts for the future] 2011-07-06 13:12:05 +01:00
jacksonmj
6fb69f591f Change PBCN switching method 
PCLN is different for compatibility with some existing saves relying on the exact
time taken for a switch on/off to spread through adjacent PCLN dots
(commit 692e2ba86d)
 2011-07-06 17:44:57 +08:00
jacksonmj
11dbdb9314 Fix crashing when pipe has a negative tmp value 2011-07-06 17:44:56 +08:00
jacksonmj
8754bb0bf6 Crashes when drawing stickman at the edge of the screen 2011-07-06 17:44:56 +08:00
jacksonmj
5dbb0dc475 Fix crash when hovering over a non-existent thumbnail 2011-07-06 17:44:56 +08:00
jacksonmj
3d82cea94f Fix stickman head in renderer 2011-07-04 00:11:43 +08:00
jacksonmj
80fd7edd7f Some fixes for non-existent particles in Lua 
Return 0 for get_property("type", ...) instead of erroring, to make checking for
particles easier. Also stop x coordinate being used as a particle index if
no particle exists at that location.
 2011-07-04 00:11:43 +08:00
Simon Robertshaw
25a2b52b64 Savask experimental heat transfer 2011-07-01 11:32:10 +01:00
Simon
648a4ac01e Adjust font glyph 214 2011-06-28 14:27:33 +01:00
Simon
30a0666774 Update font, add 'activated elements' glyph at position 214 2011-06-28 13:56:12 +01:00
Simon Robertshaw
437f13f424 Powered Breakable clone, Gravity Pump, New menu section for powered elements (needs icon) 2011-06-28 13:58:16 +01:00
Simon Robertshaw
3fe82bf525 Jagged arcs 2011-06-27 18:16:25 +01:00
Simon Robertshaw
36ee81fc6b Better photons for persistent display, ability to toggle gravity view (ctrl+g) 2011-06-27 14:01:07 +01:00
Simon Robertshaw
43b75ea058 Ensure energy particles are always drawn on top 2011-06-26 15:20:10 +01:00
Simon Robertshaw
7351da3962 Fix segfault with aray striking particles with abnormal ctype 2011-06-25 22:44:07 +01:00
jacksonmj
f3927f7202 Make pipe save ctype and tmp 2011-06-25 22:30:49 +01:00
Simon Robertshaw
6c3093cabf Hot air rises [Experimental] 2011-06-25 17:40:35 +01:00
Simon Robertshaw
f5bbc13384 Fix save button 2011-06-25 17:11:17 +01:00