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

1199 Commits

Author SHA1 Message Date
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
jacob1
76947cefbc paused checkbox when saving 2013-01-07 13:24:38 -05:00
jacob1
d8166998f8 confirm on local save delete, ESC to exit local save browser, don't allow empty save names 2013-01-07 12:21:59 -05:00
jacob1
323dae959a local save deletion and renaming with the right click context menu 2013-01-07 11:56:48 -05:00
jacob1
659c3677aa delay deleting save buttons, to prevent possible crash later 2013-01-07 10:52:06 -05:00
jacob1
4aaf3b852e fix many more uninitialized variables 2013-01-06 19:41:18 -05:00
jacob1
d1abfc313e fix mismatched free()/delete's 2013-01-06 18:26:38 -05:00
jacob1
8e09651990 fix element function replacement option 2013-01-06 12:25:13 -05:00
jacob1
15040b32b0 draw cursor outline when shift drawing lines 2013-01-05 22:59:54 -05:00
jacob1
0cf027c529 VOID, VACU, and BHOL eat LIGH as it moves 2013-01-05 22:29:33 -05:00
jacob1
8f4d936de8 allow right click to close notifications too 2013-01-05 20:03:59 -05:00
jacob1
bd3011959a fix GOL detection with DTEC 2013-01-05 19:34:51 -05:00
jacob1
bce28b83b8 faster ellipse brush resizing that doesn't lag/freeze 2013-01-04 14:18:01 -05:00
jacob1
1b2e7b3c70 fix Ctrl+x being one pixel off, better xor_rect from tpt, delete test.c 2013-01-04 13:54:25 -05:00
jacob1
8e50abcab9 change that will probably fix custom menus not showing 2013-01-02 20:47:16 -05:00
jacob1
0159c2b5af more scons fixes for windows 2012-12-29 12:45:43 -05:00
jacob1
8945b5ec77 Merge remote-tracking branch 'origin/master' 2012-12-28 22:22:05 -05:00
jacob1
b46f982def fix save as new name not actually causing the new save & title to be loaded 2012-12-28 22:21:43 -05:00
jacob1
110fa71a2c Comment out cpu_check, which only creates errors 2012-12-25 20:11:48 -05:00
jacob1
9ecfbe5a18 Merge remote-tracking branch 'origin/master' 2012-12-23 18:17:34 -05:00
jacob1
312dd8c0ba revert stickmen CONV fix, and do it another way that doesn't crash 2012-12-23 18:17:04 -05:00
jacob1
b6e69e8126 Fix small mistake in TSNS 2012-12-21 00:18:10 -05:00
jacob1
a91459916d change max to 200, 500 was a bit large 2012-12-18 23:56:41 -05:00
jacob1
e302a07694 allow a slightly larger brush size 2012-12-18 23:49:30 -05:00
jacob1
e1440f48f6 use kill_part when creating a new particle over an index, fixes STKM not respawning after CONV and probably other stuff too 2012-12-18 16:26:24 -05:00
jacob1
dc0e47ac00 fix undo not allowing any more stickmen to be placed, save stickmen in snapshots 2012-12-18 16:17:13 -05:00
jacob1
9a2df6b824 fix sltw + liquid rubiduim explosion, make it work like water's 2012-12-18 15:17:57 -05:00
jacob1
b236c75209 make TSNS not detect METL, some other sensor and CONV fixes 2012-12-18 14:55:10 -05:00
jacob1
771d71ea46 make water equalization use flags, not tmp2 (fixes EXOT / BUBW) 2012-12-18 14:08:53 -05:00
jacob1
e685e30d58 make sure that simulation variables are initialized, fixes things like water equalization always being on in old saves 2012-12-18 13:33:29 -05:00
jacob1
c06afff0a5 selecting a stamp moves it to the front of the list again (unless you hold ctrl) 
attempted to do MVC right?
 2012-12-18 12:20:52 -05:00
jacob1
672c5ee913 fix mismatched malloc() / delete [], fixes # 106 2012-12-17 23:57:55 -05:00
jacob1
dbe78c342d initialize variables in air.cpp and simulation.cpp 2012-12-17 23:49:46 -05:00
jacob1
b5de23433d fix '=' resetting air heat, fix uninitialized ambient heat setting, a few LOLZ / LOVE changes 2012-12-17 21:11:33 -05:00
jacob1
2728cf852b fix WARP being invisible, make it visible in heat display mode though 2012-12-17 20:08:46 -05:00
jacob1
f08481a88e fix TRON ignoring GOO until the last moment 2012-12-17 18:42:41 -05:00
jacksonmj
9c6f3c7fbb Fix crash in GameSave::serialiseOPS 
Only particlesCount particles have been copied from the Simulation.
All the rest are uninitialised, and may have coordinates outside the
game area. Using those uninitialised coordinates in the index for
partsPosFirstMap may cause a crash.
 2012-12-16 23:01:04 +00:00
Simon Robertshaw
d29c77b2d5 More detailed error when opening non-existent directory. 2012-12-16 16:41:30 +00:00
Simon Robertshaw
4d546b6818 Print errors regardless of build type 2012-12-16 16:40:29 +00:00
jacob1
06f8f88374 fix output appearing in stdout without DEBUG defined 2012-12-16 11:38:12 -05:00
jacob1
a85526bfac fix comment error messages not showing 2012-12-15 23:12:54 -05:00
jacob1
462bd7bdf9 fix comments being deleted when hitting enter and opening a save or getting an error when commenting 2012-12-15 22:55:53 -05:00
jacob1
1ef507d9e6 fix colors slightly from last commit 2012-12-15 20:42:30 -05:00
jacob1
c62ef2cb35 fix upvote buttons still having colored background after clearing the save, make them look more like from in tpt 2012-12-15 20:34:00 -05:00
jacksonmj
e4907d1881 Copy dcolour when MERC expands, to let people make coloured mercury thermometers 2012-12-16 00:16:05 +00:00
jacob1
a623959a31 save stamps on 1 pixel grid (works exactly like in tpt now), delete signs with Ctrl+X, also fixes stamps on very bottom/right edge and other edge cases 2012-12-15 15:13:12 -05:00
jacob1
0fd86e994a make the comment box always multiline. Fixing pasting large amounts of text into it. 2012-12-15 14:28:23 -05:00
Simon Robertshaw
735b2b659f Update version number 2012-12-15 18:29:26 +00:00
jacob1
a172a96897 make sure long amounts of text without spaces doesn't run over out of bounds 
A character may be deleted to insert a new line, but when copying something like a url, the missing one is copied back in. I couldn't get inserting a newline between letters to work right
 2012-12-15 13:17:29 -05:00
Simon Robertshaw
e0f8456531 Prompt for install on first startup 2012-12-15 17:14:43 +00:00
Simon Robertshaw
f047b4826f Make installation success message a little friendlier 2012-12-15 16:57:25 +00:00
Simon Robertshaw
6e62a54952 Add missing URL Protocol registration on Windows 2012-12-15 16:56:55 +00:00
Simon Robertshaw
201d314096 Element population histogram debug info display - has to be enabled by adding debugInfo.push_back(new ElementPopulationDebug(gameModel->GetSimulation())); somewhere in GameController 2012-12-15 15:57:57 +00:00
Simon Robertshaw
558888ac25 Ensure resampler.cpp is compiled when needed 2012-12-15 01:10:03 +00:00
Simon Robertshaw
b4475ae96f Very high quality image resampling code curtesy of imageresampler (http://code.google.com/p/imageresampler/), will replace current shitty linear interpolation for SSE2 and renderer builds. 2012-12-15 01:04:17 +00:00
Simon Robertshaw
a1af662b8f More accurate elementCount 2012-12-14 23:01:54 +00:00
Simon Robertshaw
ceee0b6dc5 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-12-14 19:44:30 +00:00
Simon Robertshaw
31c0666961 Prevent saves from being loaded twice by the Save browser 2012-12-14 19:44:16 +00:00
jacob1
f03fb97620 Merge remote-tracking branch 'origin/master' 2012-12-14 13:51:44 -05:00
jacob1
5362c56f7e update gravity wall zones whether or not newtonian gravity is on. Fixes #92 2012-12-14 13:50:36 -05:00
Simon Robertshaw
e5feefa419 Update WIRE name and description, fixes #101 2012-12-14 18:50:25 +00:00
jacob1
05fc39e40f a working scrollbar in the save preview. Also, fix the bug where you couldn't go back up a page when there weren't enough comments to fill a page 2012-12-14 13:34:00 -05:00
jacob1
002743ef08 make it easier to create new energy particles (like for mods), they would just disappear when hitting anything before 2012-12-12 22:05:39 -05:00
jacob1
d57fe7618c fix walls loading incorrectly in extremely old saves. Fix some invalid save formats being loadable (it was onlychecking the 'O' in OPS) 2012-12-12 17:31:06 -05:00
Simon Robertshaw
38862a78d1 New Conversation notifications 2012-12-09 12:05:27 +00:00
Simon Robertshaw
6478ed121c Use NotifyAuthUserChanged for GameController login, this will help users become aware when their sessions expire. 2012-12-09 01:25:05 +00:00
Simon Robertshaw
05148e8a8d C++erific text cleaner function, also, it's a good idea to actually clean text coming from signs... 2012-12-09 00:14:48 +00:00
jacob1
226de5b6f8 add back element descriptions in some cpp files, fix minor TRON search problem. Also, 
TPT-jacksonmj: Also fix bugs with energy particles that pass directly from PIPE to portal
 2012-12-06 19:51:33 -05:00
jacob1
a15372afbf TRON_NORANDOM flag 2012-12-06 18:42:46 -05:00
jacob1
2881eeb1b3 allow TRON to plan ahead which particles will disappear by the time it gets there, and go on INVS too 2012-12-06 17:53:22 -05:00
jacob1
e5a284a2ba fix compiling warnings / error 2012-12-06 12:34:32 -05:00
jacob1
122599763e Merge remote-tracking branch 'origin/master' 2012-12-06 11:01:46 -05:00
jacob1
2d7ac84c1d give TRON the ability to go through activated SWCH 2012-12-06 10:56:24 -05:00
jacksonmj
9bf5eeeef9 Fix slight particle order issue with SWCH 2012-12-04 19:38:01 +00:00
jacob1
2a8811190c Fix infinite pressure glitch with CLST 2012-12-01 12:17:41 -05:00
Simon Robertshaw
61e25060ae Update version number (build 250) 2012-11-27 20:11:25 +00:00
Simon Robertshaw
3664a22f98 Right clicking on reload button will show save preview. 2012-11-26 11:48:27 +00:00
Simon Robertshaw
b08812569c Stop using persistent connections when we don't need them. Force shutdown of Thumbnailbroker before http lib close, fixes #84 2012-11-26 10:34:17 +00:00
jacob1
6a4040f2b7 Update src/simulation/elements/VIBR.cpp 
fix EXOT destroying exploding VIBR
 2012-11-23 21:28:10 -05:00
Simon Robertshaw
da554cfef2 Allow resizing of custom brushes 2012-11-18 22:25:24 +00:00
Simon Robertshaw
f3307e47a8 Helper function for linear interpolation 2012-11-18 22:24:56 +00:00
Simon Robertshaw
045f5e14c2 Custom brushes loaded from "Brushes" folder, format is a simple RAW 8bit greyscale square format 2012-11-18 18:03:36 +00:00
Simon Robertshaw
483e907702 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-11-18 18:02:34 +00:00
Simon Robertshaw
af29942117 Ensure directory enumeration works whether there's a path seperator at the end of the directory or not 2012-11-18 18:02:28 +00:00
jacob1
4654a2aaa0 update build number, which was incorrect. Add an easy way for mods to ignore updates 2012-11-18 12:43:11 -05:00
Simon Robertshaw
0be465aa4e Use ifndef WIN instead of ifdef _unix 2012-11-18 15:48:43 +00:00
jacob1
7a21ae192f VINE cool/burn effects like in PLNT, less sharp burn lines, fix infinite smoke from TNT 2012-11-16 23:35:34 -05:00
jacob1
9e72a619ab fix directly sparking metal not heating it up, fix formatting, allowing update_particles_i to be parsed 2012-11-16 22:43:46 -05:00
jacob1
eb9b3f6bdf fix link signs ignoring the zoom window, allow right clicking link signs to use them while sign tool selected 2012-11-16 19:22:34 -05:00
jacob1
6b846c6339 add (slightly updated) README from tpt 
added new contributers, description from main page, and removed key combos and arguments that don't work
 2012-11-16 18:20:48 -05:00
Bryan Hoyle
34ed62d685 Fixed issue with opengl-renderer, missing semicolon 2012-11-16 17:03:54 -05:00
Bryan Hoyle
874cd40009 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-11-16 16:51:55 -05:00
Bryan Hoyle
fec50a2a8e Opengl fix 2012-11-16 16:50:02 -05:00
jacob1
d8be547c73 fix pause state being reset every time you clear the sim 2012-11-15 20:50:19 -05:00
jacob1
16e4c5f717 save pause state in stamps, load pause state from local saves and stamps correctly, remove accidental inclusion 2012-11-15 20:41:38 -05:00
jacob1
1e32c545d9 fix visual studio std::max problem 2012-11-15 20:23:38 -05:00
jacob1
bf3d7e9ad7 fix tpt.el.X.name commands 2012-11-15 20:13:19 -05:00
jacob1
38a18af2c5 fix crashes when deleting stamps or getting an error when saving 2012-11-15 20:00:55 -05:00
Simon Robertshaw
785fbcefdf Fix divide-by-zero error 
...  when displaying save buttons that have zero votes.
 2012-11-15 13:01:25 +00:00
Simon Robertshaw
51a5af6d5d Remove some debug printing 2012-11-12 10:48:20 +00:00
mniip
3d635bc68f More edge cases 2012-11-12 10:41:54 +00:00
mniip
947301c302 Better rectangle tool render function, no crappy pixels in edge cases anymore 2012-11-12 10:41:42 +00:00
Simon Robertshaw
29189693b3 Element palette for automatic element ID/mod mapping 2012-11-12 10:22:16 +00:00
Christoph Korn
04df448c96 Fix typo: Persistant -> Persistent 
This commit just fixes a small typo which was found by lintian
when checking the Ubuntu package to be published on PlayDeb.net.
 2012-11-09 22:23:05 +01:00
jacksonmj
d7c52241a4 Spelling: "hottest" 2012-11-06 20:26:19 +00:00
jacksonmj
fbbe9d81bf Transfer energy between VIBR and BVBR 2012-11-05 21:45:22 +00:00
Simon Robertshaw
150a2e528e Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-11-05 20:10:35 +00:00
Simon Robertshaw
8614a2d963 Update version number 2012-11-05 20:09:58 +00:00
jacksonmj
7da144fbae Fix INVS staying dark blue even when pressure is removed 2012-11-05 14:45:46 +00:00
jacksonmj
956fb39124 Oops, didn't see that parts[i].temp at the bottom, ignore the second half of that last commit message 2012-11-05 14:42:06 +00:00
jacksonmj
3cae63c733 VIBR: don't dump heat into elements that don't conduct heat, and put any remaining heat into EXOT at the end of the explosion 2012-11-05 14:18:28 +00:00
jacob1
dc41e46c81 fix two red BRAYS not being able to turn off swch from certain angles 2012-11-04 22:44:49 +00:00
jacob1
9b8357f822 update version number 2012-11-04 21:35:53 +00:00
jacob1
ca42162e5e fix heat release during explosion 2012-11-04 21:35:35 +00:00