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

1323 Commits

Author SHA1 Message Date
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