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

1492 Commits

Author SHA1 Message Date
jacob1
16cb95de64 fix problems with point queue, where it would draw a Point at A, a line from A to B, and a line from B to B every frame 2013-06-08 22:23:53 -04:00
jacksonmj
0f5d0859b4 Possibly fix crash due to Lua running out of stack space 2013-06-09 01:18:44 +01:00
jacob1
a1f9da2d0c fix tpt.selectedl not changing sometimes when using the element search or sample tool. Assume that new saves will get the auto-vote, so set that too. 2013-06-08 00:23:06 -04:00
jacob1
69961956bf fix ToolTips on split buttons not working correctly (button overrode them), fix tooltips displaying on disabled buttons 2013-06-07 20:13:18 -04:00
jacob1
1d00e712ad save publishing info in the save upload ui 
also fix the other crash when exiting the game from inside of one of these windows, because first Client::Shutdown would delete all active requests and only later ~Engine would delete _state, which delets the ServerSaveActivity window, which tries to close the active render request
 2013-06-07 19:32:38 -04:00
jacob1
58f8451b9e make saves private by default again 2013-06-07 13:08:45 -04:00
jacob1
8f72ee829f PHOT can go through PBCN and BCLN, fixes differences in PHOT cloning found in save id:1213267 
also some renaming / reorganizing in init_can_move
 2013-06-07 12:45:36 -04:00
jacob1
e146ae50ab some minor changes to tools 2013-06-06 23:28:07 -04:00
jacob1
76b92952b1 adjust tool strengths a little, to make them a little faster 2013-06-06 22:19:51 -04:00
jacob1
5ae6b18677 GOLD changes photons to yellow 2013-06-06 16:02:21 -04:00
jacob1
b594d68258 WIND tool creates WIND just by holding down the line tool again 2013-06-06 11:52:33 -04:00
jacob1
2119343b6a fix sim.NUM_PARTS, other small changes 2013-06-05 23:17:34 -04:00
jacob1
c7ce3fa4b2 make constants in the lua api's a lot easier to write 2013-06-05 22:56:00 -04:00
jacob1
875ca75b07 fix not being able to draw tool lines or boxes, but you can still press ctrl+shift before clicking to use 10x strength 2013-06-05 10:55:46 -04:00
jacob1
8d7ab7f5e2 allow creating WIND lines from lua 2013-06-01 21:57:03 -04:00
jacob1
b16524292e fix bug where you had to start using a tool before setting it's strength 2013-05-31 19:53:32 -04:00
jacob1
80380bbaa3 even more lua simulation api functions 2013-05-30 22:28:42 -04:00
jacob1
d6d20defde Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-29 20:36:34 -04:00
jacob1
cbc80de652 some new sim and ren lua api functions 2013-05-29 20:35:46 -04:00
jacob1
41e369e68e mniip: add back missing easter egg 2013-05-22 18:21:17 -04:00
jacob1
1588226120 move frameStart to right after the fps is limited (counts everything, including mouse/key functions now) 2013-05-21 23:23:57 -04:00
cracker64
4e9ee3a3a3 Fix incorrect FPS counter, need to count blit too. 
2x scale gets a massive *real* fps boost, the fps lied before.
 2013-05-21 23:05:27 -04:00
cracker64
2735a80d28 Fix STKM spawns, fix cases. 2013-05-21 18:19:05 -04:00
cracker64
e1d8585871 Jacob can't into switches 2013-05-21 17:54:37 -03:00
jacob1
6fec955f41 TPT: Stop STKM being able to jump on the bottom of the screen 509b84b4f 2013-05-20 16:50:49 -04:00
jacob1
bd262d8c92 Merge pull request #136 from mniip/scons 
mingw compiling fixes
 2013-05-20 08:30:08 -07:00
jacob1
35f84a0942 Merge remote-tracking branch 'origin/master' 2013-05-20 11:27:18 -04:00
jacob1
826b966668 reduce rand() chances to 5x the old values in elements that were changed to 3x3 loop checks instead of 5x5. Also some other fixes I found when looking at what had been changed. 2013-05-20 11:26:51 -04:00
jacob1
d29b001d82 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-19 22:59:42 -04:00
jacksonmj
45f057957b Fix description: METL does not break under pressure 2013-05-19 21:46:55 +01:00
mniip
3979395e65 reenable sighandlers for winderp 2013-05-19 10:02:42 +04:00
jacob1
5b1389621f minor fixes to descriptions (again) 2013-05-18 23:12:37 -04:00
jacob1
981f6984c2 Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-17 12:44:25 -04:00
jacob1
cbd402d8cb fix CFLM making VIBR unable to explode 2013-05-17 12:44:18 -04:00
mniip
3a640fee3f some more compiling fixes 2013-05-17 18:32:41 +04:00
jacob1
77bf649fb4 new lua sim api functions to get/set deco color, load a save, and adjust coordinates to the screen / zoom window 2013-05-16 23:12:33 -04:00
jacob1
9cd84eccde fix tpt.selectedl sometimes being incorrect 2013-05-16 21:59:40 -04:00
jacob1
7b6ded50dc rename GRAV back to PGRV, fix formatting in generator, remove useless file 2013-05-16 20:04:39 -04:00
jacob1
fd97e923f3 remove check in deco tools (that shouldn't be there) 2013-05-16 19:36:41 -04:00
jacob1
027649e858 lua simulation api functions for drawing with tools / deco 2013-05-16 19:33:30 -04:00
jacob1
6f8e2c0345 remove unneeded / duplicate constants, fix SPC_AIR/other tools so it won't conflict with lua elements (the 11th one won't work right now) 2013-05-16 17:01:33 -04:00
jacob1
751da54183 make making VIBR from molten TTAN+EXOT a little easier (molten VIBR slowly kills EXOT) 2013-05-16 15:09:17 -04:00
jacob1
242f4bcdf6 more minor fixes 2013-05-16 01:04:49 -04:00
jacob1
ebe145b39f soap lines show in nothing mode, some small changes to arguments for sim api drawing functions 2013-05-16 00:55:44 -04:00
jacob1
81876a93a3 redo some brush drawing stuff to remove useless checks, and to allow for replace mode in the future 2013-05-16 00:20:07 -04:00
jacob1
5ad819efbd remove checks on location / element in the simulation drawing functions. fix drawing circles with an rx of 0. Probably fix compiling error 2013-05-15 21:10:22 -04:00
jacob1
3d530e4f73 fix pause button. I'm not sure why I removed that ... 2013-05-15 20:36:45 -04:00
jacob1
624f038cc9 fix downvote button not being reset when you clear a save 2013-05-15 15:14:48 -04:00
jacob1
dfc33aaeea finish return values for the legacy api, add sim.saveStamp and sim.loadStamp 2013-05-15 13:51:45 -04:00
jacob1
94d21a1679 when called with no arguments, some tpt. functions will act as get functions (unfinished) 
Also, redo some menu stuff to use int's instead of Menu *s, and fix bug with toggleable buttons being toggled without triggering their actions
 2013-05-14 23:50:26 -04:00
jacob1
ab3675d6ee minor lua api fixes 2013-05-14 18:11:04 -04:00
jacob1
2e409f966c gfx.draw/fillcircle 2013-05-14 16:39:20 -04:00
jacob1
431f5a0083 lua simulation api functions for creating particles, walls, boxes, and walls 2013-05-14 14:40:18 -04:00
jacob1
18ddb7a155 some more description changes 2013-05-13 22:12:03 -04:00
jacob1
7856f727a5 rename TUGN to TUNG (more popular spelling). Broken BRMT smelts back into TUGN 2013-05-13 21:10:45 -04:00
jacob1
e5cbcecdb9 fix circle brush shape at some sizes 2013-05-13 19:07:59 -04:00
jacob1
a5ae843553 also check .Enabled in PROP 2013-05-11 22:42:58 -04:00
jacob1
135bf44347 fix bug where you could set invalid types with PROP 2013-05-11 22:29:24 -04:00
jacob1
51f27bfad7 Merge remote-tracking branch 'origin/master' 2013-05-11 21:47:13 -04:00
jacob1
9d89d4b79b fix tooltips and dt 2013-05-11 21:43:52 -04:00
mniip
4d9b9b17d7 D: 2013-05-11 15:08:32 +04:00
Simon Robertshaw
c2cdec9e62 Togglable lua scripting 2013-05-11 11:52:35 +01:00
jacob1
67e1213905 fix tpt.message_box, fix compiling error 2013-05-09 18:52:13 -04:00
Simon Robertshaw
e53f2bf0b5 Forward resample argument correctly from VideoBuffer resize method 2013-05-09 23:33:43 +01:00
cracker64
d1c8978a34 just one to_boolean works... any number is true. 2013-05-09 16:03:14 -04:00
cracker64
4c5667fbc6 Fix tpt.message_box correctly to only accept true/false third arg. 2013-05-09 15:51:01 -04:00
Saveliy Skresanov
f35f221554 Rocket boots for fighters. 2013-05-08 23:36:04 +07:00
Saveliy Skresanov
c6930ddc5f Merge remote-tracking branch 'upstream/master' 2013-05-08 23:10:01 +07:00
Saveliy Skresanov
9893f59657 Fix "blow power" for stick man, disable rocket boots on E-hole. 2013-05-08 23:08:29 +07:00
jacob1
645bcb1bcd Merge remote-tracking branch 'origin/master' 2013-05-08 10:29:33 -04:00
jacob1
c0b4592839 fix PSCN BRAY (tmp = 2) not stopping normal BRAY from going through 
also some other random things
 2013-05-08 10:29:10 -04:00
jacksonmj
89a0603b53 Rocket boots for stickman, because why not 
Pass through gravity wall to activate, fan wall to deactivate.
Accelerate with left/up/right keys. Plasma is spawned when accelerating,
and STKM is immune to plasma but not other hot elements when rocket
boots are enabled. Hold left+right to slow down quickly.
STKM spawn element is retained and can still be created while using
rocket boots, but it may be difficult to do anything useful with the
spawn element whilst spewing hot plasma everywhere.
 2013-05-08 15:12:28 +01:00
cracker64
45c321f1b3 Fix ARAY better, instead of relying on conduction check to stop on BRAY, which we know doesn't conduct. 2013-05-08 07:48:54 -04:00
jacksonmj
20c261826d STKM - fix jumping in the x direction in different gravity modes 2013-05-07 15:01:24 +01:00
cracker64
2f8574f62b gol2 array is static size, adding new GoL won't increase memory usage. 2013-05-06 13:30:03 -04:00
cracker64
77102f4bba Optimize GoL a bit, haven't changed gol2 yet. 2013-05-05 18:10:13 -04:00
Simon Robertshaw
b8b5f91e20 Only free GameView if it can be closed 2013-05-06 00:24:53 +01:00
Simon Robertshaw
fea71ec69b Update version number 2013-05-05 14:33:08 +01:00
Simon Robertshaw
afbef49db2 Fix temperature sensor 2013-05-05 14:30:04 +01:00
mniip
9f33cbf79e well, fuck you too, simon 2013-05-05 08:49:36 +04:00
jacob1
082530d18c fix tooltip issues in render options too 2013-05-05 00:18:28 -04:00
jacob1
4f2d24bcff small fix 2013-05-05 00:10:57 -04:00
jacob1
b45a45ba4e fix element scrollbar issues, fix fading of HUD/intro text, fix compiling error with last commit 2013-05-05 00:07:07 -04:00
jacob1
07486c9885 drawtext_outline to fix unreadable infotips, tooltips fade in and out (more like old tpt) 2013-05-04 23:03:59 -04:00
jacob1
2d0ce60afe fix not being able to draw TUGN under high/low pressure 2013-05-04 20:34:47 -04:00
jacob1
cb5ca55fc2 New Element: Pressure sensor 2013-05-04 20:28:28 -04:00
jacob1
08f05d69c1 move some elements around 2013-05-04 19:50:11 -04:00
jacob1
a4e75d587f add #ifdef WIN / #idndef WIN around some lua socket files, for easier visual studio compatibility 2013-05-04 19:19:23 -04:00
jacob1
73fe68a3eb Merge pull request #133 from mniip/lua 
Fix the luaopen_socket_core loader
 2013-05-04 16:12:24 -07:00
mniip
69bf9e1058 Fix the luaopen_socket_core loader; derp me 2013-05-05 03:09:08 +04:00
Simon Robertshaw
48c7d8a916 Fix Lua includes in luasocket builtin 2013-05-04 22:41:33 +01:00
Simon Robertshaw
8ef266c08e Fix compiling with new BSOD in debug mode 2013-05-04 22:41:08 +01:00
Simon Robertshaw
66e21ce049 Merge pull request #131 from mniip/lua 
builtin luasocket
 2013-05-04 14:26:49 -07:00
Simon Robertshaw
3799d5ed86 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-05-04 21:43:43 +01:00
jacob1
36efb48644 possible piston bug fix for save 1176828 2013-05-04 16:40:04 -04:00
Simon Robertshaw
2d8c5a7747 TPT Blue screen of death - try its best to catch some signals (SIGSEGV) and unhandled exception in the game loop 2013-05-04 21:39:43 +01:00
jacksonmj
b2153b5af4 Typo in rules 2013-05-04 17:19:25 +01:00
jacksonmj
79a75c4441 Fix solidification temperature of molten TUGN 
Previously it was 973 K, not the same as the melting point of TUGN
 2013-05-04 17:19:25 +01:00
jacob1
f93a70edfb ctrl+r reload shortcut, fix a few brush drawing bugs, fix stamp xor area, fix lua log text overlaps 2013-05-04 11:52:37 -04:00
Simon Robertshaw
b0f14e0c54 Fix position of scrolly bio, increase user profile window size 2013-05-04 15:18:37 +01:00
Simon Robertshaw
99c560bfd3 Prevent TUGN from breaking when resetting air 2013-05-04 15:04:19 +01:00
Simon Robertshaw
1575d93d48 Fix compilation issues on Windows with Window Position Loader 2013-05-04 15:00:45 +01:00
Simon Robertshaw
ed9710c33d Tungsten breaks under pressure changes 2013-05-04 14:44:16 +01:00
Simon Robertshaw
cab667001d Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-05-04 14:42:23 +01:00
jacob1
630216c253 change ">" to "..." (from mniip) 2013-05-04 00:20:33 -04:00
jacob1
ae34c43c66 update with latest rules, fix grammar, fixes #126 2013-05-03 23:54:08 -04:00
jacob1
0b2e8a412e fix some descriptions 2013-05-03 23:19:16 -04:00
jacob1
c68e4b1393 change descriptions of many elements to be more consistent, contain more info, and be more helpful. 2013-05-03 22:42:36 -04:00
jacob1
773d500d8a mniip: fix crash on non-string error in step and other functions 2013-05-03 20:13:56 -04:00
mniip
88cbb81ec4 fix crash on non-string error in step and other functions 2013-05-04 04:11:52 +04:00
jacob1
3018c597c4 make GOLD sparkle slightly, and it kills NEUT 2013-05-03 19:47:09 -04:00
jacob1
d4391cc19e set window position before displaying it 2013-05-03 19:11:44 -04:00
jacob1
06111ce456 Merge pull request #130 from mmbob/master 
Save window position when closed
 2013-05-03 15:14:24 -07:00
Simon Robertshaw
dd0f5f5efb New element: Tungsten, very high melting point 2013-05-03 22:33:39 +01:00
mniip
4cd12e8561 allow multiline code input, command will be executed when enough code given 2013-05-03 09:56:13 +04:00
mniip
0233d8db46 print returned values; implicit return in console; console source 2013-05-03 01:54:21 +04:00
mniip
d8023d21cd better luacon_geterror 2013-05-03 01:09:13 +04:00
mniip
29496cb6d3 fix tpt.log so that when called multiple times, it doesn't overwrite the text 2013-05-02 23:49:53 +04:00
mniip
e7b29ab9b5 statically linked, or better to say, builtin luasocket 2013-05-02 22:41:01 +04:00
mmbob
df14a77124 LoadWindowPosition has a better default position 
LoadWindowPosition now positions the window on the nearest monitor if
the window is not inside a monitor.
 2013-05-02 13:00:13 -04:00
mmbob
7bc321b176 Merge remote-tracking branch 'upstream/master' 2013-04-30 21:54:09 -04:00
jacksonmj
2eaed9c9d4 Correct gold melting point 2013-04-30 23:10:07 +01:00
jacksonmj
526e93204a INST flood fill change so that vertical conduction is only prevented for 1px wire crossings. Needs thorough testing 
Fixes #129 , and prevents INST diodes when using a 2px vertical crossing a
1px horizontal.
 2013-04-30 22:34:06 +01:00
mmbob
9d4cbd3112 Merge remote-tracking branch 'upstream/master' 2013-04-29 21:50:12 -04:00
jacksonmj
b83043e2a6 Remove obsolete code from TPTScriptInterface 2013-04-27 15:55:30 +01:00
jacksonmj
9bc939d422 Less dependence on particle order for GOLD fast electricity conduction 2013-04-27 13:55:41 +01:00
Simon Robertshaw
828569415f BREAKING NEWS: Hell has frozen over 
New element, GOLD, a corrosion resistant metal that can conduct electricity faster, molten GOLD will turn into molten VIBR on contact with EXOT
 2013-04-27 11:38:20 +01:00
mniip
bfe00dc1f3 Ooooooohh 2013-04-27 02:57:41 +04:00
mniip
77e837c775 Fixed graphics function crash when unable to catch errors 2013-04-27 02:20:06 +04:00
mniip
a1cdef4c90 a major rewrite of event registration, it's fully compatible, yet has new advantages 2013-04-27 01:25:18 +04:00
mniip
9f7d45f8fd print does implicit tostring, also generates a list ouside of console too 2013-04-26 17:15:33 +04:00
mniip
f9017bc7bb fixed dropper debug printing 2013-04-25 22:56:41 +04:00
mmbob
e166640cbb Fix reading hexadecimal in TPTScriptInterface 
Instead of subtracting 'A', subtract 'a'
 2013-04-22 13:05:10 -04:00
mmbob
63050715ee Replace __ImageBase. Save + load window position. 
Instead of using the __ImageBase global variable, use the
GetModuleHandle(NULL) function to get the exe's HMODULE/HINSTANCE.
Save the window position when the game is closed and restore it when it
is opened.  Defaults to being centered on the desktop.
 2013-04-22 13:04:43 -04:00
jacksonmj
ada7c7bb11 Prevent "!set type none blah" 2013-04-18 21:07:21 +01:00
jacob1
b9f150f0d2 update version (86.1.263 -> 87.0.267) 2013-04-13 10:57:11 -04:00
jacob1
3b7e418628 fix assert error when resampling an image to an invalid size (corrupted stamps) 2013-04-09 23:40:18 -04:00
jacob1
602cbf0701 fix setting negative numbers in the old console (using atoi) 2013-04-09 23:13:13 -04:00
Julian Meyer
649e5f2042 Add --nofft option to compile without FFTW3 
This should help Mac users who were having trouble compiling.
 2013-04-10 00:20:36 +01:00
Simon Robertshaw
b4fb55f86e Allow signing out and editing profile from the old login button, add a button to edit avatar (directs to the website at the moment) Allow viewing profiles by clicking avatars 2013-04-07 14:40:00 +01:00
Simon Robertshaw
8d312ecdfa Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-04-07 12:46:09 +01:00
cracker64
f7dd658a30 SPRK from SWCH should check both cases. 2013-03-27 12:34:03 -03:00
Simon Robertshaw
533a15ec9d Update version number 2013-03-26 09:31:46 +00:00
Simon Robertshaw
0791f5b0f8 TPTScriptInterface: Ability to read hexadecimal constants 2013-03-26 09:24:15 +00:00
jacob1
010f7790eb Fix CRAY bug that deletes particle 0 2013-03-25 12:36:04 -03:00
jacob1
36adc3c516 Fix NEUT not going through INVS 2013-03-25 01:18:47 -03:00
Simon Robertshaw
9b5b85f9b0 Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy 2013-03-24 12:24:17 +00:00
jacob1
6bf98ccdca Merge remote-tracking branch 'origin/master' 2013-03-23 10:55:06 -04:00
jacob1
c50e12df28 CFLM defusses VIBR, a few speed improvements to VIBR 2013-03-23 10:53:49 -04:00
Simon Robertshaw
bdc69f31c0 Fix includes for GUI stuff 2013-03-22 14:26:24 +00:00