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

1082 Commits

Author SHA1 Message Date
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
jacksonmj
828623f9ec Change freezing point of VIBR lava, and make sure VIBR always absorbs energy particles 2012-11-04 21:10:27 +00:00
jacksonmj
12eb085d20 VIBR changes from jacob1 
Including:
Molten TTAN + EXOT = VIBR.
VIBR + ANAR = BVBR. (BOYL reaction removed)
All absorbed heat/particles/pressure are stored in one property, tmp.
Graphics changes
 2012-11-04 20:35:43 +00:00
Simon Robertshaw
e3a016d9c9 SC_SENSOR in Elements API 2012-11-03 18:06:19 +00:00
jacob1
d586a6d0ab PPIP doesn't break with pressure, to match TPT 2012-11-03 16:11:54 +00:00
jacksonmj
2ed53a99ae Change EXOT properties to match TPT 2012-11-03 16:11:11 +00:00
Simon Robertshaw
bd473f02ca Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-11-03 12:22:07 +00:00
Simon Robertshaw
2f9e8c0a5f Empty engineprocess for renderer compiling 2012-11-03 12:21:53 +00:00
jacksonmj
fea55f9ac9 Add PLSM to stacking exclusion list, and fix some cases of stacked EMBR causing BHOL 
Stacked EMBR + displacement -> other particles stacked -> BHOL.
Therefore stop displacement to stop BHOL formation.
 2012-11-01 00:28:45 +00:00
Simon Robertshaw
057ec914cf Don't use SDL defines in platform independant code 2012-10-29 10:38:04 +00:00
Simon Robertshaw
68e6fe2502 More emtpy key defines 2012-10-29 10:33:23 +00:00
Simon Robertshaw
effcc74d6d Empty key defines for no sdl 2012-10-29 10:32:57 +00:00
Simon Robertshaw
48be91e4df Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-10-29 09:36:32 +00:00
Simon Robertshaw
e08bc6680b Format: Buffer to pti, Save renderer 2012-10-29 09:36:16 +00:00
Bryan Hoyle
32bdcb89e8 VIBR fixes 2012-10-28 21:11:18 -04:00
jacksonmj
caf262ed60 Decrease absorption chance for SPNG, to make release of water from saturated SPNG look a bit less strange 2012-10-27 00:56:02 +01:00
jacksonmj
9a0ca32372 Make conversion of PHOT to ELEC using BIZR, and enrichment of DEUT with ELEC, work better 2012-10-27 00:56:02 +01:00
Simon Robertshaw
9b4f710e28 Menu icon for sensors menu and fix for VIBR std::max args 2012-10-26 15:58:39 +01:00
Simon Robertshaw
c3ba809806 Fix error from merging 2012-10-26 15:32:10 +01:00
Simon Robertshaw
a1d98ffc31 Fix BVBR for generate.py 2012-10-26 15:29:55 +01:00
jacob1
6d6b0dfa9f some VIBR changes, also allow it to be compiled with Scons 2012-10-26 15:18:52 +01:00
jacob1
69aad4caa2 some testing with DEBUG mode, add some stuff 
Conflicts:
	src/cat/TPTScriptInterface.cpp
 2012-10-26 15:17:02 +01:00
jacob1
e773abdcc8 Ctrl + G gravity grid toggle 2012-10-26 15:16:05 +01:00
jacob1
3ad7cf4539 !quit function 2012-10-26 15:15:52 +01:00
jacob1
5ef6bd8507 close console when using the !load command 2012-10-26 15:15:45 +01:00
jacob1
3a29fc0268 Save local saves as current name option (overwrites them automatically). Fix filename not showing when first saving a local save 2012-10-26 15:15:38 +01:00
jacob1
e2622657f0 ability to reload and resave local saves without retyping name 2012-10-26 15:15:24 +01:00
Simon Robertshaw
63daf67d44 Improve EXOT description 2012-10-26 15:14:57 +01:00
jacob1
6d1c7be740 initialize all stickmen variables, not just legs 2012-10-26 15:13:27 +01:00
jacob1
fd07d35e34 limit the number of signs that can be placed 2012-10-26 15:13:00 +01:00
jacob1
00fdd8308a possibly fix lag/crash when deleting stamps 2012-10-26 15:12:50 +01:00
jacob1
3461cc64d4 bring back the old vote bars 2012-10-26 15:12:42 +01:00
jacob1
d0b14dc64b don't render invalid elements 2012-10-26 15:12:35 +01:00
jacob1
4d207b1146 fix INVS graphics 2012-10-26 15:12:21 +01:00
jacob1
947660fcd4 Fix hydrogen not burning right (with and without realistic heat), allow h2 to burn at all temps while still allowing fusion to work correctly 2012-10-26 15:12:13 +01:00
jacob1
ccd9284e61 improve the GOL menu descriptions 2012-10-26 15:12:05 +01:00
jacob1
c58a3fb2dc TSNS doesn't detect things with an equal temp (fixes detecting wires) 2012-10-26 15:11:59 +01:00
jacob1
b84460d79b visual studio compatibility, plus change text a little 2012-10-26 15:11:43 +01:00
jacob1
3f093c8072 VIBR explosion/graphical changes, it now has a while before it explodes after getting to the limit 2012-10-26 15:11:22 +01:00
jacob1
cd7ca6d417 some VIBR changes/fixes 2012-10-26 15:10:50 +01:00
jacob1
04b76a4b48 VIBR/BVBR - vibranium. Initial commit, doesn't seem to work yet 2012-10-26 15:10:44 +01:00
Simon Robertshaw
0b09d2e0f3 Allow TSNS and DTEC to detect photons and other energy particles. Set default TSNS radius to 1 to make it easier to avoid detecting the wire connections 2012-10-10 21:27:36 +01:00
Simon Robertshaw
da07c22ee4 new elements: DMG (Force bomb) and TSNS (Temperature sensor) 2012-10-10 19:29:11 +01:00
Simon Robertshaw
249e3dcad3 Merge pull request #195 from Huulivoide/master 
Minor fixes needed to build on Linux/64bit.
 2012-10-09 08:43:13 -07:00
Jesse Jaara
b1d3ebacd2 Windows doesn't have unistd.h, use only in unix platforms. 2012-10-07 12:11:41 +03:00
Jesse Jaara
ec413dd057 Fix an error that prevents building on 64bit systems. 2012-10-06 19:52:48 +03:00
Simon Robertshaw
af181faeea Revert "multiple BRCK colors (suggested by Catelite)" 
This reverts commit 4a8ae25299e465ab55072dd512b5818881ec5a67.
 2012-10-05 17:25:04 +01:00
jacob1
774bc08c2c Move LOLZ/LOVE Rule tables into more appropriate location (element file) 2012-10-05 16:52:53 +01:00
jacob1
d159467b63 LOLZ and LOVE work again 2012-10-05 16:33:54 +01:00
jacob1
f19f393e22 multiple BRCK colors (suggested by Catelite) 2012-10-05 16:33:45 +01:00
jacob1
a16534e782 don't let TNT flood fill explode when under other particles (prevents lag) 2012-10-05 16:33:24 +01:00
jacob1
d2af4470a5 show # of parts, [GRID X], PIPE/PPIP with X, and molten X (with debug on) in HUD 2012-10-05 16:33:12 +01:00
jacob1
433a80b099 holding both Ctrl and Shift still enables 10x stength 2012-10-05 16:33:00 +01:00
jacob1
a9619fad33 Console Show quickoption 
(best way I could think of)
 2012-10-05 16:32:50 +01:00
jacob1
72b00ca5e1 info tip on deco/ngrav/aheat changed 2012-10-05 16:32:39 +01:00
jacob1
e600c20ba9 undo ambient heat in snapshots 2012-10-05 16:32:06 +01:00
jacob1
97cea273e5 Fast quit option (disable to make "X" act like in tpt) 2012-10-05 16:31:04 +01:00
jacob1
71db872e64 {t:15100|text} to open a forum thread (will try to add more shortcuts later) 2012-10-05 16:30:55 +01:00
Simon Robertshaw
7c0ba094b8 Ensure save is stored in memory for reload when using Save as current name, correct ServerSaveActivity to call SaveUploaded when doing an instant upload 2012-10-05 16:30:32 +01:00
Simon Robertshaw
0fbe12772d Only run autorun if it exists 2012-10-05 16:04:55 +01:00
jacob1
5c59b9d6cb don't render fire on stamps (reduces lag) 2012-10-05 15:49:54 +01:00
jacob1
63c364652d prevent setting invalid types, fix setting type to "NONE", "C4", & "C5" 2012-10-05 15:49:41 +01:00
Simon Robertshaw
b35fd0298c Flush stamps list to file when deletins, Rename stamps undelete function to rescan 2012-10-05 15:46:42 +01:00
jacob1
7313bd81ca fix problem with last commit 
there was no other missing stamps problem actually, just this
 2012-10-05 15:23:24 +01:00
Simon Robertshaw
34fdffa340 Fix textbox key repeat issue 2012-10-05 15:23:01 +01:00
jacob1
d45dd605e9 Stamp fix button to bring back deleted stamps 2012-10-05 15:20:33 +01:00
jacob1
cb8efcd0f9 fix visual studio compiling errors (but not the dirent.h one) 2012-10-05 15:19:00 +01:00
Simon Robertshaw
4bb402f4fd Fix stuttering issue with FPS cap 2012-10-05 14:21:38 +01:00
jacksonmj
707c11203e Fix extra BUBW sometimes being produced when CO2 dissolves 2012-10-03 15:42:30 +01:00
Jesse Jaara
1ba412d3ba Add couple of missing header files needed by GCC 4.7. 2012-10-02 23:29:40 +03:00
Simon Robertshaw
b98f5faace Fix photon blending mode 2012-10-01 21:54:52 +01:00
Simon Robertshaw
0e394ed62e Don't highlight menus when the mouse button is down. 2012-10-01 14:26:43 +01:00
Simon Robertshaw
58763f0900 Fix stamp library loading issue (wasn't loading beyond 512 bytes, readsome doesn't always reach eof before not reading n 2012-10-01 13:36:56 +01:00
Simon Robertshaw
c0c5717efe Limit save description length 2012-10-01 13:03:03 +01:00
Simon Robertshaw
134a59609d Collapse comment box after sending comment 2012-10-01 12:41:31 +01:00
Simon Robertshaw
98faf2b192 Don't reset tick counter when loading saves, fixes issue with LIGH tool 2012-10-01 12:32:56 +01:00
Simon Robertshaw
39afea3945 Impose limit when pasting into textboxes 2012-10-01 12:28:21 +01:00
Simon Robertshaw
d78082d368 Negative values in old console commands 2012-10-01 12:14:47 +01:00
Simon Robertshaw
7568e082dd Allow pausing when using stamp placement/selection 2012-10-01 12:07:02 +01:00
Simon Robertshaw
0801497ed2 Fix wall clipping during stamp rotation 2012-10-01 12:02:04 +01:00
Simon Robertshaw
163fbde8af Fix issue where thumbnails are sometimes the incorrect ones 2012-10-01 00:15:09 +01:00
Simon Robertshaw
89e9623725 Fix word wrapping issue (words moved onto new lines were not being added to the line width) 2012-09-30 23:57:23 +01:00
Simon Robertshaw
288a4f710a Activate deco tools when using deco menu 2012-09-30 23:04:29 +01:00
Simon Robertshaw
b97cf098b3 Draw walls behind particles 2012-09-30 22:41:50 +01:00
jacob1
f652786557 fix saves getting corrupted when saving, fix error messages not showing (correctly) 2012-09-30 20:46:08 +01:00
jacob1
be1b9112e8 Fix some uninitialized variables, add back sandcolor changing 2012-09-30 20:43:38 +01:00
Simon Robertshaw
1c60ce25ee Delete notification before removing from vector 2012-09-30 18:40:10 +01:00
Simon Robertshaw
02e09224e0 Prevent crash when pasting in Linux 2012-09-30 17:22:08 +01:00
Simon Robertshaw
68a32aa376 Pass points by value for drawing tools 2012-09-30 16:26:05 +01:00
Simon Robertshaw
70174bff47 Set appropriate default values for some static Lua interface variables 2012-09-30 16:25:29 +01:00
Simon Robertshaw
90ebd3e54c Better hanling of edgeMode and "New Sim" button 2012-09-30 16:19:44 +01:00
jacob1
d6f832b4f5 remove 'Z' quickoption 
is confusing and useless, only needed when you draw gravity walls. I can't figure out how to do a show console quickoption
 2012-09-29 23:21:24 +01:00
jacob1
b3741cd67c lock icon on unpublished saves 2012-09-29 23:03:02 +01:00
Simon Robertshaw
006dfdf596 Move PPIP to powered 2012-09-29 23:02:22 +01:00
Simon Robertshaw
2e99638d76 Fix crash loading null stamp after pasting (http://powdertoy.co.uk/Discussions/Thread/View.html?Thread=15107) 2012-09-29 22:53:32 +01:00
Simon Robertshaw
ef24a1ad44 Stable release options 2012-09-29 14:51:27 +01:00
Simon Robertshaw
e8418a8ca0 Lua FileSystem API 2012-09-29 13:28:56 +01:00
Simon Robertshaw
f96cb74a08 ren.decorations() to enable/disable/get decorations (Lua API) 2012-09-29 11:45:41 +01:00
Simon Robertshaw
9a42e47eb0 Move old Lua API into another file, make the old drawin API have the old position quirk for rects, new graphics (gfx) api with drawRect, fillRect, drawTect, drawLine and textSize functions. 2012-09-29 00:20:52 +01:00
Simon Robertshaw
261c654ca0 HTTP/1.1: Allow multiple whitespace characters in header fields 2012-09-28 17:19:00 +01:00
Simon Robertshaw
92dd8ac804 Fix case sensitive filename 2012-09-27 14:29:50 +01:00
Simon Robertshaw
a953871bd8 Move Render presets to the right 2012-09-27 13:42:05 +01:00
Simon Robertshaw
b0b402d90e Improvement to some of the rendermode icons 2012-09-26 17:15:30 +01:00
Simon Robertshaw
ff24e97d3e Always focus text box for property tool 2012-09-26 16:56:22 +01:00
jacob1
6ec915df80 make PROP interface a little easier to use (first part of tpt issue 78) 2012-09-26 16:46:29 +01:00
jacob1
2f26fac9d0 Fix own / fav buttons being enabled even when not logged in 2012-09-26 16:46:21 +01:00
jacob1
e418ca5ac3 fix minor memory problem with last commit 2012-09-26 16:46:10 +01:00
jacob1
95cc715d71 render preset buttons in render options interface, also shift + 1 life view shortcut 
modify it if you don't like how it looks, but it turned out better than I expected
 2012-09-26 16:46:03 +01:00
jacob1
2a4298047c Fix smudge issue 2012-09-25 22:57:11 +01:00
jacob1
de7218da8d Fix black border around dialogs being off (I think I got all of them) 2012-09-25 20:10:23 +01:00
jacob1
5de2a4e479 Icon adjustments 2012-09-25 20:09:54 +01:00
jacob1
b57d956ca8 Icons and tooltips for everything in renderview. (Empty space not filled yet) 2012-09-25 20:09:43 +01:00
jacob1
187a5189d5 some improvements to the render options interface and checkboxes (icons and tooltips coming next) 2012-09-25 20:09:24 +01:00
jacob1
5ee1c7ff80 Fix incorrect deco colors being selected 2012-09-25 20:08:33 +01:00
jacob1
d5e322c98d small change 2012-09-25 20:07:48 +01:00
jacob1
a9ccbf409b display hex value in deco editor (replaces Cancel button) 2012-09-25 20:05:42 +01:00
jacob1
a4f12d367b Make number boxes easier to use, plus limit deco editor numbers to 255 2012-09-25 20:05:28 +01:00
jacob1
bb08de4544 allow alpha editing 
Conflicts:

	src/colourpicker/ColourPickerActivity.cpp
 2012-09-25 20:02:44 +01:00