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

1612 Commits

Author SHA1 Message Date
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
Simon Robertshaw
9abe51526c Move all GUI source files into gui/ 2013-03-22 14:14:17 +00:00
Simon Robertshaw
2c311b9a36 Use "http://" for update/startup check 2013-03-22 13:40:54 +00:00
Simon Robertshaw
e6db760205 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-22 13:21:13 +00:00
Simon Robertshaw
700aff4784 Don't try to parse update check response if it's NULL! 2013-03-22 13:20:54 +00:00
jacob1
29e2604f57 fix compiling error 
also bug, I had some weird formatting that broke the json parsing
 2013-03-21 21:49:04 -04:00
Simon Robertshaw
c4a500aa21 Merge 2013-03-21 21:49:59 +00:00
Simon Robertshaw
81a34222d1 POST requests for APIRequest, allow saving user details from within the game, Asynchronous HTTP POST 2013-03-21 21:49:06 +00:00
jacob1
d357fcdc36 add back bounds check to DTEC/TSNS where needed, change VIBR back to 5x5 loop checks 
a better way to change it to 3x3 may have to be found that has the same ratios, other elements like WATRs have their rates changed too
 2013-03-17 12:21:45 -04:00
jacob1
b617b8b656 fix compiling error 2013-03-16 14:00:11 -04:00
Simon Robertshaw
b4564f212a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-16 17:45:45 +00:00
Simon Robertshaw
f05044ab68 APIRequest, Aync methods for client, Profile edit/viewer (WIP) 2013-03-16 17:45:18 +00:00
jacob1
3a738846a3 add identifier constants based on the display name to the lua api 2013-03-16 13:23:19 -04:00
Saveliy Skresanov
d76650f7e6 Remove unnecessary code in legacy part. 2013-03-16 23:16:08 +07:00
Saveliy Skresanov
43974d8537 Narrowed loops for all elements in the first list. 
Probabilities might be messed up a bit, I'm not sure.
 2013-03-16 23:03:02 +07:00
Simon Robertshaw
d383d6d7e5 Higher quality thumbnails for Renders 2013-03-16 11:25:13 +00:00
Simon Robertshaw
b6e1526345 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-16 11:20:23 +00:00
Simon Robertshaw
0646b7fe41 Nicer resize method for VideoBuffer, fix Local and Server save previews 2013-03-16 11:20:11 +00:00
jacob1
ff304321c5 new PSTN arms get deco color of the pushing pistons 2013-03-15 21:32:46 -04:00
jacob1
2267f34386 add a button to show the save uploading rules inside the save upload dialog 2013-03-15 20:32:39 -04:00
jacob1
cd8ea8ad0e fix scrollbar not showing in scrollpanels if your mouse starts out already ontop of one 2013-03-15 14:48:01 -04:00
Simon Robertshaw
ca9ea8bb8a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-15 13:41:27 +00:00
Simon Robertshaw
73b6ff4efb Use VideoBuffer in place of thumbnail 2013-03-15 12:59:55 +00:00
jacob1
2aa483e0a2 fix gravatars not showing for moderators 2013-03-14 23:58:09 -04:00
Simon Robertshaw
6b68c04cd6 Fix multiple free after merging multiple request objects 2013-03-14 12:10:56 +00:00
Simon Robertshaw
9ab70756af Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-14 11:30:35 +00:00
Simon Robertshaw
9479b7f330 Move requestbroker into new folder, make request process function a method of Request 2013-03-14 11:30:24 +00:00
jacob1
10e104f3f5 change BOUNDS_CHECK define to just be true, it isn't needed since an element can never update when it's closer than 3 pixels away from the edges of a save. 2013-03-13 15:56:40 -04:00
jacob1
e493cf8a47 fix all tab spacing issues in all the element files 2013-03-13 15:54:34 -04:00
Simon Robertshaw
7a055a9d90 More unnecessary string duplication 2013-03-12 21:29:27 +00:00
Simon Robertshaw
35b7f62d3b Remove unnecessary string duplication (http_init creates an internal copy of the proxy string) 2013-03-12 21:27:42 +00:00
Simon Robertshaw
aae7113c81 Remove images from image cache on exit 2013-03-12 21:24:56 +00:00
Simon Robertshaw
de680a1e5c Merge 2013-03-12 21:21:01 +00:00
Simon Robertshaw
86b7a11800 Make thumbnailbroker more general purpose, image requests for requestbroker, avatars in previewview 2013-03-12 21:17:19 +00:00
jacob1
134d1fab10 delete ancient changelog.txt 2013-03-12 15:00:51 -04:00
cracker64
319ffb7e77 Change some old NEUTPENETRATE to NEUTPASS, NEUT should only displace GOO, WOOD, and PLNT. 2013-03-11 17:34:49 -04:00
cracker64
f2823b0ee8 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-03-10 23:27:22 -04:00
cracker64
2caa240d9d Delete thumbnails on close. 2013-03-10 23:23:17 -04:00
jacob1
a65d93523d fix small free/delete mismatch / a warning 2013-03-10 23:21:28 -04:00
jacob1
85d6c12721 fix stamp thumbnails not showing until you move the mouse, add a few new[]'s replacing some .c_str() pointers in client.cpp 2013-03-10 22:08:00 -04:00
Simon Robertshaw
e6bca489c9 AvatarButton/holder, rename ThumbnailBroker for more general purposes 2013-03-10 18:08:34 +00:00
cracker64
5aa233d4e7 Use cancels instead of pthread_getattr_np for compatibility. 
Stopping the download would be nice, it still goes in the background.
 2013-03-10 01:47:09 -05:00
cracker64
3abc33fd3b Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-03-09 22:48:12 -05:00
cracker64
a9e66429d6 Fix some memory issues when closing preview UI too fast. 
I'm not sure if this pthread usage is ideal, but it does seem to work on linux.
 2013-03-09 22:47:08 -05:00
jacob1
e6f6eedd13 fix empty signs being created when shifting them out of bounds, draw parts of images when it goes partway off the top of the screen. 2013-03-09 16:50:36 -05:00
jacob1
c66d4c72f5 Merge remote-tracking branch 'origin/master' 2013-03-09 11:50:14 -05:00
jacob1
1ca39e1e7d allow new searches even if tags haven't loaded 
fixes search buttons being enabled but not working until the tags list is loaded
 2013-03-09 11:49:49 -05:00
Simon Robertshaw
6090f0b0aa Don't leak saveComments vector in PreviewModel, also don't create unnecessary duplicate in PreviewView 2013-03-09 12:19:02 +00:00
jacob1
189f96d35f case insensetive local save searches, fix extention being counted in the match 2013-03-08 22:31:08 -05:00
jacob1
f9c219da93 a few more memory leak fixes 2013-03-08 20:56:54 -05:00
jacob1
89c784fcfa attempt to fix random memory corruption / crashing bug ... this is the only thing that looks like it could be it 2013-03-07 23:26:24 -05:00
jacob1
77d233240f fix mismatched malloc/delete[]'s when not using new image resampler 2013-03-07 22:14:00 -05:00
jacob1
a411fda7de fix CRAY(SPRK) difference 2013-03-06 21:13:42 -05:00
jacob1
9316054ab2 fix CRAY(SPRK) bugs (?) 2013-03-06 14:23:26 -05:00
jacob1
037618e6f8 remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h 2013-03-06 12:05:59 -05:00
jacob1
ad951eb9af fix being able to toggle disabled buttons (fixes save browser issue with this) 2013-03-04 15:59:45 -05:00
jacob1
38573cc30e by date turns white like my own does when selected 2013-03-04 15:27:51 -05:00
jacob1
0f5b4a9ec8 fix pressing esc in login prompt logging you out, fix possible sign bug crash 2013-03-04 14:57:40 -05:00
jacob1
6bea8f5235 revert life changes, will be redone later in a faster way 2013-03-03 19:58:53 -05:00
jacob1
55f090b4d2 Merge remote-tracking branch 'origin/master' 2013-03-03 19:08:05 -05:00
jacob1
f951e5cda9 fix LIFE 2013-03-03 19:07:15 -05:00
cracker64
de6bb6a960 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-03-03 17:08:36 -05:00
jacob1
8b83ae9f95 PSTN ctype sets the element that stops it, FRME with a tmp of one is non-sticky (doesn't pull) 2013-03-03 16:36:37 -05:00
cracker64
2be0b22211 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-03-03 16:32:11 -05:00
cracker64
5e1c7d7932 Some better comments in SPRK, renamed rt and ct. 2013-03-03 16:30:34 -05:00
jacob1
cca1898ee8 Merge remote-tracking branch 'origin/master' 2013-03-03 15:39:10 -05:00
jacob1
17d79e8d8e fix crash when drawing particles in invalid coordinates (using console) 2013-03-03 15:38:52 -05:00
cracker64
bb87299eb4 Missed one SPRK case. 2013-03-02 20:07:17 -05:00
jacob1
846d7d8064 allow NEUT to travel through ICE and SNOW, and for it to turn OIL to GAS (both like inextremely old versions) 2013-03-02 19:07:00 -05:00
cracker64
85cb4b37c9 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-03-02 00:42:17 -05:00
cracker64
d58100dc07 More fixes, redid a bunch of SPRK, so far everything I've tested works fine. 2013-03-02 00:42:07 -05:00
jacob1
cd18515e0a piston retraction now checks pmap 2013-03-01 23:06:02 -05:00
cracker64
a9f4b5fe34 Quick fix for IRON 2013-03-01 00:55:10 -05:00
cracker64
0d70547cf0 More fixes to fix fixes and new fixes to fix stuff. 2013-03-01 00:41:53 -05:00
cracker64
5873d69586 Going through again. 2013-02-28 12:37:16 -05:00
cracker64
c65081d3ed Finished first pass-through for all elements. 
Will get a few more places later.
 2013-02-28 00:40:36 -05:00
cracker64
08d1a68ce0 More fixes. 2013-02-27 17:20:05 -05:00
cracker64
3d2e594150 Small modifications part three. 2013-02-27 12:08:10 -05:00
cracker64
27e3e12518 Small optimizations number 2. 2013-02-27 00:11:23 -05:00
cracker64
8250515e97 Lots of small optimizations and things, nothing should be functionally different. 
Only gotten through a few elements, more later.
 2013-02-26 18:59:37 -05:00
jacob1
e700ff2988 Merge remote-tracking branch 'origin/master' 2013-02-24 22:10:31 -05:00
jacob1
572d099e29 fix a few more memory errors 2013-02-24 22:09:33 -05:00
jacksonmj
5c2f310577 Make default DCEL exactly reverse the effect of default ACEL 2013-02-25 01:05:12 +00:00
jacob1
27ac5ab75d you never saw that ... 2013-02-24 19:16:06 -05:00
jacob1
fbf52794e5 fix even more memory leaks 2013-02-24 19:11:37 -05:00
jacob1
b92bd245c8 fix 4 MB memory leak on every save 2013-02-24 15:23:34 -05:00
jacob1
0939494747 fix problems found with valgrind with shifting stamps and saving 2013-02-24 14:12:48 -05:00
jacob1
f138e10917 Merge 2013-02-24 11:52:09 -05:00
jacob1
7379a6b5ba fix crash when hovering the mouse over invalid wall types 2013-02-24 11:50:20 -05:00
Simon Robertshaw
8dfb1ecf87 ACEL and DCEL use life for strength value 2013-02-24 11:50:10 +00:00
jacob1
6b1e99a731 allow ACEL and DCEL strength to be modified with ctype 2013-02-23 23:45:40 -05:00
jacob1
20d8eff7f5 remove uneeded PSTN check, fix PSTN not retracting sometimes, fix PSTN bug where is wouldn't properly tell the difference between PSTN and PSTN arms 2013-02-22 16:50:33 -05:00
jacob1
11f45e3e99 CRAY spawns elements at its temp, fix color glitch with ARAY too, move FRME to force 2013-02-22 11:54:32 -05:00
jacob1
40c4289ce8 fix CRAY(SPRK) bugs, make CRAY act more like before again 2013-02-22 00:19:12 -05:00
jacob1
3da733b027 fix PSTN bugs where FRME would still move even if all of it couldn't, fix PSTN going through walls, fix bug where the PSTN extention may not be created in some glitched cases 2013-02-21 23:35:44 -05:00
jacob1
2184d35b28 reset colored and partsRemaining, to fix bugs when CRAY is sparked multiple times at once 2013-02-20 21:11:50 -05:00
jacob1
74387040a1 fix CRAY INST mode ignoring length, fix CRAY going ignoring walls, fix CRAY + GOL particles, allow CRAY to create sparks 2013-02-20 18:36:00 -05:00
Simon Robertshaw
27a60e7b71 Particle position lookup with sim.partID 2013-02-17 15:53:34 +00:00
Simon Robertshaw
52d0bb918d sim.partProperty API method, sim.partPosition API method 2013-02-17 15:24:56 +00:00
Simon Robertshaw
e3453aedd1 Update version/build number 2013-02-17 11:31:34 +00:00
Simon Robertshaw
81f92ed0ec Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-02-17 11:31:03 +00:00
Simon Robertshaw
5beb4255c8 Tag origin version info in save files 2013-02-17 11:30:53 +00:00
jacob1
a3454c49be fix CRAY only deleting odd numbered elements 2013-02-16 15:11:59 -05:00
jacob1
5f331d4fce Update build number too 2013-02-16 13:47:12 -05:00
Simon Robertshaw
76ef237f46 Update version number 2013-02-16 15:27:47 +00:00
Simon Robertshaw
a091f55fec Allow implicit conversions when setting text property on some Lua API UI elements 2013-02-16 14:52:29 +00:00
Simon Robertshaw
8d04b260a7 Add missing removeComponent for Lua API 2013-02-16 14:49:05 +00:00
jacob1
01cd146ee9 fix mac compiling, fix renderer, fix other minor compiling issues 2013-02-14 23:31:31 -05:00
jacob1
5807602cc1 fix modifiers from lua, fix right ctrl 2013-02-11 11:45:49 -05:00
jacob1
4e918ab76d fix some more brush bugs, remove alt-sample brush 2013-02-10 14:27:49 -05:00
jacob1
897d250eb5 fix crash if save data can't be loaded 2013-02-09 21:16:15 -05:00
jacob1
28e8b9eb39 make smudge tool more similar to the old one 2013-02-09 19:42:31 -05:00
jacob1
dc6398a33e fix deco sample tool with 1 px brush, fix deco sample also sampling HUD/other text 2013-02-09 18:18:53 -05:00
jacob1
a989d97744 flood fill / sample brush shape, fix rectangle snapping 2013-02-09 00:01:00 -05:00
jacob1
685bde5c21 blobby walls in blob view 2013-02-08 22:50:37 -05:00
jacob1
1359045b14 fix tpt.selectedl not updating with sample brush, always put photons[] on top in HUD 2013-02-08 22:24:34 -05:00
jacob1
b8d53b5f76 fix sign box size, sign width with {t} and {p}, and zoom box size 2013-02-08 17:59:13 -05:00
jacob1
7ce34ad732 one more small thing: show gravity in debug mode hud even when it's a small value 2013-02-08 11:52:59 -05:00
jacob1
cd0af92fb3 minor fixes to color picker / small speed improvement 2013-02-08 11:39:14 -05:00
jacob1
8e02443f0a prevent CRAY from destroying DMND 2013-02-01 14:29:18 -05:00
Simon Robertshaw
486d26e40b Allow limited arm size from tmp2 2013-01-26 19:44:05 +00:00
Simon Robertshaw
03fde95719 Fix issue where piston won't push particles at index 0 2013-01-26 18:56:19 +00:00
Simon Robertshaw
631e49b8b7 Piston fix: Adjust colour and prevent piston from pushing too far when there's empty space 2013-01-26 18:04:24 +00:00
Simon Robertshaw
12e3802bf4 Put back default piston size 2013-01-26 17:16:58 +00:00
Simon Robertshaw
8e689fdd08 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-01-26 17:15:02 +00:00
Simon Robertshaw
3e60181dbe Piston collapses spaces properly 2013-01-26 17:14:44 +00:00
jacob1
46b767da0c clear persistent effects when it's display mode is removed 2013-01-25 23:15:33 -05:00
jacob1
1d97f1c985 typing '~' doesn't close the lua console 2013-01-25 22:57:51 -05:00
jacob1
4f59211ba8 Fix brush not being visible when using CTRL to change the size 2013-01-25 22:45:23 -05:00
jacob1
ea38fc2d86 fix possible crash with LIGH 2013-01-23 21:54:15 -05:00
jacob1
c5eecff131 fix "i" argument to graphics functions. 
Also, they don't overwrite the default one, you can pass in nil to tpt.element/graphics_func for the function to restore the original.
 2013-01-23 16:48:21 -05:00
Simon Robertshaw
7475a49e0b Fix piston retraction 2013-01-23 19:52:45 +00:00
Simon Robertshaw
6c89c63a44 PSTN: Do not accept current from diagonals, increase distance for spark checks 2013-01-23 19:20:52 +00:00
Simon Robertshaw
0034dd654e Fix FRME limits 2013-01-23 19:17:11 +00:00
Simon Robertshaw
412e13a03e Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-01-23 12:39:08 +00:00
Simon Robertshaw
da12cc6d46 Change to pistons, piston push length is base-1 blocks 2013-01-23 12:38:53 +00:00
Simon Robertshaw
a7aa26fa1a Added FRME - A solid that keeps its simple structure when pushed by piston 2013-01-23 12:36:31 +00:00
Simon Robertshaw
00cf48b520 Fully functional pistons, retract+extend 2013-01-23 12:06:06 +00:00
jacob1
07aade6c4c fix crash when pressing enter to open a save, and not logged in. Fix CRAY description 2013-01-23 00:26:57 -05:00
Simon Robertshaw
28fdb32bfb Clean up some unused variables from PSTN.cpp 2013-01-22 22:42:52 +00:00
jacob1
392271a269 fix tpt.set_property setting integers above 255, fix fs.isDir/File, add "Color" as valid property for elements api, fix tpt.display_mode to match tpt, other minor changes 2013-01-21 20:19:34 -05:00
Simon Robertshaw
9fb3e75f93 PSTN.cpp - Remove unused code 2013-01-20 23:08:50 +00:00
Simon Robertshaw
fde0233ea8 Pistons - WIP, No retraction yet 2013-01-20 23:08:16 +00:00
Simon Robertshaw
87d6553413 C-RAY: Similar to A-RAY, creates particles 2013-01-20 14:34:07 +00:00
jacob1
226a85a18d attempt to fix random deletion bug (can't reproduce easily, so can't tell if it's fixed easily) 2013-01-19 23:02:12 -05:00
jacob1
267cf9281b Update Build number 2013-01-19 17:40:25 -05:00
Simon Robertshaw
e7b174a78d Revert "move version info to version.h, no longer needs full recompile on version change" 
This reverts commit b3a2ab735b.
 2013-01-19 22:00:56 +00:00
jacob1
b493788b26 fix missing #ifdef statement breaking compiling when not on linux 2013-01-19 11:46:21 -05:00
jacob1
7d5cb361f0 fix error with renderer compiling 2013-01-18 14:50:06 -05:00
jacob1
8e7dfb20e9 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-01-18 14:38:05 -05:00
jacob1
ded94b475d move clipboard functions out of misc.cpp without creating errors 2013-01-18 14:37:24 -05:00
jacob1
17cd0e74f2 add gravmap setting. Getting doesn't work right now, and maybe i should check if gravx/y can be modified too 2013-01-16 23:48:09 -05:00
jacob1
f9f79e4f53 combine pressure functions, add sim.ambientHeat, sim.velocityX, sim.velocityY 2013-01-16 22:53:46 -05:00
jacob1
fc9f263961 sim.get/setPressure, a few constants to the simulation api 2013-01-16 22:34:32 -05:00
jacob1
639d4fc43c implement tpt.set_shortcuts 2013-01-16 14:05:31 -05:00
jacob1
e9b86365c8 log error messages for update functions 2013-01-16 11:42:06 -05:00
jacob1
b3a2ab735b move version info to version.h, no longer needs full recompile on version change 2013-01-15 11:28:28 -05:00
jacob1
62195dc2a3 allow removing zoom tool when shift drawing lines 2013-01-15 11:10:30 -05:00
jacob1
a27d637ceb Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-01-15 10:31:17 -05:00
jacob1
8723bbc63c probably fix compiling error 2013-01-15 10:30:13 -05:00
jacob1
c1ad6c57ba Update version number, before I forget. 
Version 85 happened after the commit ... i'm not sure and there is no 64 bit linux so I can't test
 2013-01-15 00:33:08 -05:00
jacob1
76349ddbd4 don't allow 1-3 letter searches, because bad search results are just returned 2013-01-15 00:02:55 -05:00
jacob1
ccc51f2d68 don't allow tags unless 4 letters long 2013-01-14 23:38:55 -05:00
jacob1
e515512d88 deco menu needs to be clicked to enter, press 'b' to get out of deco editor too 2013-01-14 13:11:01 -05:00
jacob1
73fdfd411c copy support in linux 2013-01-13 15:24:52 -05:00
jacob1
01bfd486e7 local copy / paste support inside tpt for all platforms 2013-01-12 21:25:22 -05:00
jacob1
41751da619 change some free/malloc's back to delete/new's 2013-01-12 21:06:52 -05:00
jacob1
e29b4c14d6 Merge pull request #114 from mniip/deco 
'b' key opens deco editor
 2013-01-12 14:04:31 -08:00
cracker64
b3037857f0 Detach soap before going into STOR, fixes 1065982 (mostly) 2013-01-11 23:06:42 -05:00
mniip
df628c7fe3 moving gameModel was a bad idea, so i just made an alias function 2013-01-11 22:28:57 +04:00
mniip
269420c6c7 'B' opens deco editor 2013-01-11 21:29:35 +04:00
jacob1
f814d264b2 defocus components removed from scrollpanels, to prevent crashes 2013-01-10 12:02:54 -05:00
jacob1
17302f03c7 don't allow streamline floodfill 2013-01-10 09:50:10 -05:00
jacob1
9d67dd61e8 re-add tpt.display_mode, check element id's in tpt.set_property, tpt.get_script error with no args 2013-01-08 23:28:41 -05:00
jacob1
162a8ecba5 readd tpt.hud and tpt.set_console commands 2013-01-08 22:00:45 -05:00
jacob1
6dad17c2e1 fix console not closing when you use !load 2013-01-08 21:00:13 -05:00
jacob1
9e218f1847 change right click button id to 4 for lua events, to match old tpt 2013-01-08 00:11:47 -05:00
jacob1
ca143945be change tpt.fillrect dimentions to old tpt ones, move brush list generating out of BuildMenus 2013-01-07 21:50:43 -05:00
jacob1
158b054023 fix tpt.selectedl/r/a, but it returns the string identifier now instead of an id 2013-01-07 21:05:58 -05:00
jacob1
986173af4c save signs in snapshots 2013-01-07 17:54:10 -05:00
jacob1
5e20dd8545 allow directory search to find files with the extension repeated twice 2013-01-07 17:39:05 -05:00