Commit Graph

301 Commits

Author SHA1 Message Date
Simon
cd08a7102c Changes from cracker 2011-01-08 17:40:30 +00:00
jacksonmj
d17758cc08 Yet more function pointers. 2011-01-08 09:00:59 +00:00
jacksonmj
9af0072b21 Further function pointers. 2011-01-07 23:05:26 +00:00
jacksonmj
685ede0643 More electricity rewrite. 2011-01-07 22:20:47 +00:00
jacksonmj
6908f3dd0b Tidy up. 2011-01-07 20:26:09 +00:00
jacksonmj
b69712bbdb Some more function pointers 2011-01-07 20:03:58 +00:00
jacksonmj
cb02bdfe21 Rewrite electricity code. 2011-01-07 18:00:31 +00:00
jacksonmj
aebcc0ebe4 Use PROP_CONDUCTS more. 2011-01-07 16:56:15 +00:00
jacksonmj
f3ded5f08c More function pointers. 2011-01-07 16:18:22 +00:00
jacksonmj
b661418d7e Replace pstates and some pressure ifs with array. 2011-01-07 14:47:10 +00:00
jacksonmj
1ab4d328a6 Start function pointers 2011-01-07 14:14:35 +00:00
jacksonmj
ed8c0031f4 Astyle. 2011-01-06 22:26:31 +00:00
Simon
2a3af54e92 Kiosk mode, full screen. requested by dante3rd 2011-01-06 08:55:10 +00:00
Cracker64
45078b5933 update, and another small ARAY feature, goes through SWCH. 2011-01-05 18:34:39 -05:00
Simon
7e3530a705 Few changes and fixes from cracker for ptypes 2011-01-05 20:41:20 +00:00
Simon
5d7c0194f1 INST enabled. INST modifier for ARAY - makes it not stop 2011-01-05 17:42:39 +00:00
Cracker64
fd2f0c905b better liquid movement in radial gravity, '=' resets pressure, cannot draw stickman on clone anymore, 'w' does not work when stickman2 is out, use shift-w. 2011-01-04 20:53:24 -05:00
Simon
0eb4089b08 Easier fancy effects, by Mur 2011-01-04 19:42:50 +00:00
Cracker64
5a37f32ca1 update with simon, and shift-v now does every other frame properly 2011-01-04 13:26:28 -05:00
Simon
3a2bc76643 Gravity control by Moach 2011-01-04 13:35:16 +00:00
Simon
6340ff2ac9 Merged new life types from cracker 2010-12-31 11:26:52 +00:00
Cracker64
6519fc167e 7 more gol types, fixed gol code to work with it. 2010-12-31 00:52:40 -05:00
Simon
c98099f8df Small changes to SING from cracker 2010-12-30 22:38:27 +00:00
Cracker64
2b253cf73c simon update and small SING change to make it betterer. 2010-12-30 16:55:02 -05:00
Simon
b92e6b391f Merge recent cracker changes 2010-12-30 09:55:43 +00:00
Cracker64
2212d04fb0 added SING, QRTZ and PQRT, see mod thread on forum. 2010-12-30 00:46:35 -05:00
Simon
3715925dd9 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-29 21:15:40 +00:00
Cracker64
25b95e211e new display, Life, shows life in a grayscale gradient, will ONLY show up in debug mode, on shift-1, fix filt floodfill, portal has bigger storage, other fixes. 2010-12-29 09:44:12 -05:00
Simon
713034ed61 Cracker Merge 2010-12-27 23:21:26 +00:00
Cracker64
761ea03882 added a basic coldflame explosive, ignites from CFLM or something cold. 2010-12-27 17:29:05 -05:00
Cracker64
0dbb53606b forgot PROP thing in powder.h, adjustments to heat glow and BOMB 2010-12-24 15:59:27 -05:00
Cracker64
65a60b3812 updated with BOMB 2010-12-24 15:00:59 -05:00
Simon
b86e6d96d0 Forgot to change particle states table 2010-12-24 15:38:14 +00:00
Simon
8f22758990 More awesome 2010-12-24 15:04:48 +00:00
Simon
1983512b3d Hot metal glow for more views 2010-12-24 13:51:09 +00:00
Simon
db364c549f You know, stuff. 2010-12-24 12:51:39 +00:00
Felix Wallin
2e57ba16f3 small fix for indention 2010-12-23 21:53:18 +01:00
Simon
bd9b01c3e2 Cracker Merge 2010-12-22 18:17:06 +00:00
Cracker64
321c570581 forgot to delete a note. 2010-12-22 01:31:22 -05:00
Cracker64
e5ebf1fb41 updated with latest, and FWRK crash fix, INST looks for INSL, wifi lines only show in debug mode. 2010-12-22 00:13:01 -05:00
Simon
5026bfa105 Revert "nice"
This reverts commit 14b4dfef87.
2010-12-20 18:11:11 +00:00
Felix Wallin
14b4dfef87 nice 2010-12-20 14:34:55 +01:00
Simon
1e4e7ea475 Invis can now be used to turn photons into neutrons 2010-12-19 19:07:23 +00:00
Simon
314e937ec8 Allow building with Visual Studio, at the loss of some functionality, also, updates to version number 2010-12-19 18:39:39 +00:00
Simon
e380237cbc Fix merge 2010-12-19 17:29:30 +00:00
Simon
92d22ac590 Nibble is a noob, also fix for persistent mode bug 2010-12-19 14:20:38 +00:00
Cracker64
2dad930818 added spawnpoints for stickmen, so they respawn. 2010-12-18 23:22:10 -05:00
Cracker64
039a4e2f31 Added second stickman for Lulz, it works great though, controlled by wasd. 's' was moved to ctrl-s and d is ctrl-d 2010-12-18 02:14:53 -05:00
Cracker64
809676a1dc added invertion to rotate, ctrl-shift-r, will invert x-axis. NEUT+ACID=ISOZ,GLOW+WATR=DEUT. added ` to toggle replace mode for people without insert keys 2010-12-17 01:35:27 -05:00
Cracker64
327ccb7bba a rotate tool! ctrl-r, then select the area, it will rotate counterclockwise, no properties are saved right now, it deletes and recreates. 2010-12-16 00:17:08 -05:00
Cracker64
5b2c689394 another swch fix, desl fire fix, shift-g will make grid go down, BIZR glows from velocity in FIRE,ect. METL/BRMT/BMTL change color when heated in heat gradient view. other small changes. 2010-12-14 17:23:27 -05:00
Felix Wallin
9c805f8643 there we go 2010-12-14 21:59:37 +01:00
Felix Wallin
fae101b1df we obviously need the particle index 2010-12-14 21:43:28 +01:00
Felix Wallin
4220fd8e35 The only thing it broke was compilation, fixed 2010-12-14 17:10:34 +01:00
Felix Wallin
455b27e3ce started on function pointers. Pushing to master because of otherwise impossible merges 2010-12-14 17:08:37 +01:00
FacialTurd
d20ba9f342 2010-12-13 04:11:38 -08:00
Cracker64
23f828135a updated with icons, and some more fixes. 2010-12-12 20:13:05 -05:00
Simon
dc25b3a811 Added glyphs for GOL, Heat gradient view and alternate pressure view 2010-12-12 13:47:30 +00:00
Simon
f1df4cae6a Merge latest cracker changes 2010-12-12 12:24:38 +00:00
Cracker64
af72702434 few thingies before i go 2010-12-12 01:46:40 -05:00
Cracker64
dc318fa14a more small changes/fixes. Generation count for GoL in debug, resets with 'r'. 2010-12-11 23:31:08 -05:00
Simon
be7acfd99b Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2010-12-11 03:46:34 +00:00
Simon
d8cd71f912 cracker merge 2010-12-11 03:46:21 +00:00
Cracker64
95c4e49f53 Lots of small changes/fixes mentioned in my mod post. 2010-12-10 14:05:06 -05:00
Cracker64
d017764fbe Photons no longer give heat to insulation type things. is basically the same as official besides a few bug fixes. 2010-12-08 14:53:53 -05:00
Cracker64
cbf41389a2 Bugfix for wifi, would cause a double spark if timed just right. updated to 2010-12-08 12:14:02 -05:00
Felix Wallin
c9f852085b Revert "function pointers, not doing anything yet"
This reverts commit 048a0672c7.
2010-12-08 17:34:18 +01:00
Felix Wallin
1b5f6b2dc0 Merge branches 'master' and 'function_pointers' 2010-12-08 17:14:12 +01:00
Felix Wallin
81d6cae1f2 test 2010-12-08 17:12:54 +01:00
Felix Wallin
048a0672c7 function pointers, not doing anything yet 2010-12-08 17:08:15 +01:00
Simon
96da331601 Improved pause flag, will now only pause, not unpause the game 2010-12-08 01:15:00 +00:00
Simon
4355b8b2d5 Fix for prerender save and fan drawing 2010-12-07 21:48:03 +00:00
Simon
58b85e19b4 Change version number 2010-12-07 17:47:48 +00:00
Simon
46940a8e4f Added saving of pause state and particle tmp value, removed INST from the menu 2010-12-07 16:26:53 +00:00
Cracker64
fff7ecedf8 removed battery from INST wire, some other small fixes 2010-12-06 18:54:09 -05:00
Simon
ae828393ce Fix open_ui bug where client will crash with a null pointer exception if the prerender_save function returns null due to newer save or other 2010-12-06 19:45:01 +00:00
Simon
122babe356 Added ARAY, a instant ray that can create holograms and transfer electrical energy 2010-12-06 19:32:33 +00:00
Cracker64
efb7c6bc9c updated with simon's changes 2010-12-05 21:56:46 -05:00
Simon
40ab51d79f Cracker64 merge 2010-12-05 15:49:48 +00:00
Cracker64
2cf25c8a6a FILT, a photon color filter, not really a filter right now, but it changes the color. Other small changes 2010-12-04 23:29:41 -05:00
Simon
b54c0b6934 Particle life now saved as 16bit integer, increases limit and fixes saving of wire and other elements. Version 44 to reflect save format change 2010-12-04 22:17:01 +00:00
Cracker64
d56684312d WIFI, a wireless SPRK transmitter, has 25 'channels' controlled by temp. starting at 0C, every 100 degrees is a different channel, they are colored as well. Heat-gradient display, colors of elements is slightly changed based on temp. maybe some other fixes. 2010-12-04 12:24:54 -05:00
Cracker64
01a2dcaf41 lots and lots of small changes/fixes. fixed typo for water movement, made parts_avg kinda better? electronics still work. 2010-12-03 00:13:00 -05:00
Cracker64
656b5ff496 SHLD, element that grows from spark and will regrow if damaged. Lots of other small changes and fixes. replace mode ONLY draws on the element to be replaced. 2010-12-01 15:27:13 -05:00
Cracker64
491016eaf4 Fixed love crash on mac, added adjustable grid mode, hit 'g', goes up to 9. 2010-11-30 14:43:42 -05:00
Cracker64
bb16ffa2bb PUMP is now powered and blue, fixed some wall probems, portals are more random, maybe fixed love for mac? 2010-11-29 22:42:36 -05:00
Cracker64
77a17ecaee VINE, plant grows up the side of WOOD. INST wire is now also a battery and will charge if it doesn't give off a spark right away. Will give spark to NSCN or SWCH that is on. found some more wall defines i missed. moved wall code up 100 numbers. INVS, solid that turns invisible to elements when under pressure. 2010-11-28 16:58:57 -05:00
Cracker64
1eeda3f5cc ANAR, behaves opposite of dust. fix fuse loading, floodfilling of neut/photons. 2010-11-25 01:01:28 -05:00
Philip
f02d504656 Added PSTE, a colloid element that turns solid under pressure. WTF is now radioactive with neutrons. boom. 2010-11-24 00:42:20 -05:00
Philip
d89e7e4abe added ISOZ, isotope z, radioactive liquid, reacts with photons, not neutrons.Has a solid form that slowly decays away. uses negative pressure. Instant wire INST, conducts instantly, like walls. Only takes spark from PSCN and only gives it to NSCN. Portal elements. PRTI is the 'in' side, and PRTO is where they come out. you don't need a lot. 2010-11-23 13:28:57 -05:00
Philip
50f4da5996 plnt eats smoke and gives off o2. GLAS acts as insulation for acid, kind of 2010-11-22 15:54:35 -05:00
Philip
60e4c076cb floodfill fix, @_@ elements, grav changes color 2010-11-22 15:36:24 -05:00
Simon
9684fdc377 Small changes 2010-11-22 20:06:20 +00:00
Philip
3d2292890b Fixed ehole, made wall code use defines, wall specific deletion. 2010-11-21 01:08:33 -05:00
Philip
a38dddaf5a Made wall code use #defines. small fix for adjustabl brush. 2010-11-19 22:03:52 -05:00
Philip
c1182db42d Fixed SWCH for real. Fix repeating spark while creating it. Adjustable x and y for brushes. 2010-11-19 18:01:56 -05:00
Philip
435f71c781 Added FRZZ FRZW GRAV. add square brush, hit tab to switch between the two. pipe ctype saves. 2010-11-18 23:27:24 -05:00
Philip
5e56850682 Added element replacement ability. hit insert. capslock is shift-alt so you can do lines/boxes with specific element erase. read post for other changes 2010-11-18 16:23:24 -05:00
Philip
5d0da4b138 Added PIPE, yay. Added whole menu sections to be able to be specifically deleted. 2010-11-18 00:01:46 -05:00
Philip
9383c1ca4c Added a different velocity/pressure display. Added old fireworks i made. 2010-11-16 19:47:18 -05:00
Philip
245628a7fd added WARP PUMP fix alt-click select. 2010-11-16 12:15:34 -05:00
Philip
663db5374f Added BCLN LOVE WTF. description on forum post. A fix for loading COAL. made everything use the #defines for cmode (ex. CM_HEAT instead of 5). 2010-11-15 11:57:37 -05:00
Philip
02067b1587 Fix movement of fog and fixed life exchange. 2010-11-12 21:14:47 -05:00
Philip
ebcded767e First release of the mod 2010-11-12 12:46:02 -05:00
Philip
bf1d90d7c3 CRAC improvements. Resistant to fire when wet, steams when hot, fixed wall errors. 2010-11-11 11:02:02 -05:00
Philip
179a9f731a Updating with all new changes 2010-11-10 19:42:42 -05:00
FacialTurd
8760a2b2a9 Version Number 2010-11-10 12:56:39 -08:00
Philip
bd8a9f4931 made myself for AntB because he is a bad coder, here you go 2010-11-10 14:28:05 -05:00
Philip
febd9be627 Added 3 more life types 2010-11-09 01:04:59 -05:00
Philip
16265e3736 made faster 2010-11-08 19:59:03 -05:00
Philip
3de06dea86 Increased efficiency a lot, GoL only runs when there is a GoL particle, and other small checks to make it faster. Blank screen fps went from 44 to 60, with a few particles, 44 to 55. 2010-11-07 17:55:25 -05:00
Philip
ea1c44aba4 slight change 2010-11-07 01:03:57 -05:00
Philip
fd79639c5d compressed code, yay and a grid for rule sets. 2010-11-07 00:15:45 -04:00
Philip
3ad216f953 added amoeba, move, pseudo life, and diamoeba particles 2010-11-06 20:45:36 -04:00
Philip
75922ae31d added Day&Night life particles 2010-11-06 19:03:35 -04:00
Philip
a2c8443c36 Added high life, assimilation, and 2x2 to life particles, and put it in its own menu section. 2010-11-06 17:13:43 -04:00
Simon
43cbb294ef Visual Studio and MinGW comapatbility 2010-11-06 17:42:22 +00:00
Philip
a23d46a9f6 GOL works 100% now. todo: make some way to set GSPEED from ingame, and is the number of frames per generation. 2010-11-05 21:25:02 -04:00
Philip
068076a4ae Made it go faster, once per frame, and cool heat colors. 2010-11-05 01:22:43 -04:00
Philip
4ed5b47bff LOL GOL WORKS 2010-11-04 22:12:51 -04:00
Simon
9a40e4924e Major improvements to text wrapping, acceptible but still character based 2010-11-03 15:51:02 +00:00
Philip
4e46f51bcf changed moving sign code so it doesn't modify the sign itself. 2010-11-01 23:56:06 -04:00
Philip
edab61ec4d forgot to delete something 2010-11-01 12:58:22 -04:00
Simon Robertshaw
783f156e20 Inlude missing header file for neutron fix 2010-10-31 10:26:32 +00:00
Simon Robertshaw
457c049f95 Functionality finished, tweeks needed 2010-10-30 20:50:36 +01:00
Philip
8f397f3a03 moving signs! i think everything still works, click the weird random extra button, someone can add an icon later. 2010-10-29 23:37:15 -04:00
Philip
bb3b1a52ac added specific element eraser again for my own uses sinces everyone else thinks its useless. alt-click to pick and then alt-click in the game to erase the picked element. you could then have right and left click be two different elements and alt-click on the eraser to keep two elements selected and an easy to use eraser as well 2010-10-28 19:31:06 -04:00
Philip
bff5961d60 updating 2010-10-28 19:18:06 -04:00
Simon Robertshaw
ba1b9f7584 More functionality and improvements to open_ui 2010-10-25 12:13:34 +01:00
Simon
1b03d85d09 Fix neutrons, add properties, fix photons 2010-10-22 13:33:56 +01:00
Simon
1bc0afc2bf Whoops 2010-10-22 00:04:45 +01:00
Simon
f88bb0f246 Changes for open_ui 2010-10-21 23:59:56 +01:00
Felix Wallin
fdd3d24031 some 'fixes', better solution: change to what it was before the neutron fix. 2010-10-21 18:14:09 +02:00
Simon
e711060cb9 Neutrons fixed somewhat 2010-10-21 11:48:21 +01:00
Simon
92b28b7879 New Open UI - Half Complete 2010-10-20 22:31:19 +01:00
Felix Wallin
c4368bf8af moved defines 2010-10-16 23:35:33 +02:00
AntB
edcd7db073 Neutron Fix 2010-10-16 14:55:01 +01:00
AntB
1d167e1054 Manual merge - UI changes 2010-10-15 17:36:05 +01:00
AntB
a49f81decb Photon fix >.< getting the right weight helps 2010-10-15 00:07:02 +01:00
AntB
b3739e34f8 int weight additions to powder.h complete, removed can_move array. redid a bit of formatting 2010-10-14 00:57:27 +01:00
AntB
c9f8f2c8c9 Adjusted Powders and set some Misc 2010-10-14 00:17:52 +01:00
AntB
1ef7942119 Powders Set 2010-10-13 23:46:11 +01:00
AntB
bb278b323b Solids Set 2010-10-13 12:51:45 +01:00
AntB
2d6fa4597f Formatting 2010-10-13 12:41:27 +01:00
Simon
24a3b5919f IRON 2010-10-12 16:59:49 +01:00
Philip
e4f9f77de9 Updating 2010-10-04 00:29:37 -04:00
Simon
5591a7346c Firework improvements and Fire changes 2010-10-03 14:56:30 +01:00
Felix Wallin
b7f8fd4ba6 fixed indention 2010-10-02 19:45:55 +02:00
Felix Wallin
6e81c2a88c Added reflection, thanks to Skylark 2010-10-02 17:59:24 +02:00
Felix Wallin
9ca6983e35 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2010-09-27 12:56:23 +02:00
Felix Wallin
58d710b224 layout change 2010-09-27 12:53:05 +02:00