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

313 Commits

Author SHA1 Message Date
Cracker64
964ecf2ecf Other things overwritten, and changes from jacksonmj 2011-01-28 20:13:29 -05:00
Cracker64
880ed33fc7 oops, silly copy file, and fixed the new GoL from simon's fail merging. 2011-01-28 19:58:54 -05:00
Cracker64
bcea95c5ca update to latest 2011-01-28 18:54:50 -05:00
jacksonmj
a5ff51f5a5 Restore cracker64 changes overwritten by merge 2011-01-28 21:46:40 +00:00
Simon
e9ae32b0cc Merge with jacksonmj, Warning: potential for lot of bugs 2011-01-27 20:32:34 +00:00
Cracker64
e7f2eb92c5 ctrl-'=' will reset sparks 2011-01-19 17:56:55 -05:00
Cracker64
b25a6ecd59 some photon fixes, and better resets on reload/clear 2011-01-19 16:24:54 -05:00
Cracker64
1b35811bd4 revert all limit changes, a little too glitchy, can be done later when current limit is reached. 2011-01-19 14:25:56 -05:00
Cracker64
ff01973658 made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8. 2011-01-19 13:48:59 -05:00
Cracker64
e1eeaf9e9a test with increased element limit, there seems to be no performace decrease to me anyway. element limit of 4096 2011-01-17 19:11:30 -05:00
Cracker64
926450a9a3 more life types using states, put them in new menu. Maybe get some way to switch to new menu on mouseover of last spot of current life menu 2011-01-16 20:54:41 -05:00
Cracker64
db5bb618c1 fix loading of old GoL saves, and fix wall crash 2011-01-16 13:54:36 -05:00
jacksonmj
1833be451f Merge branch 'cracker64' into dev 
Conflicts:
	includes/powder.h
	src/graphics.c
	src/main.c
	src/powder.c
 2011-01-15 16:23:51 +00:00
Cracker64
b673be0ac2 a fix so photons can be deleted and show up on HUD :) 2011-01-14 00:29:32 -05:00
jacksonmj
7fb086065a Correct spelling 2011-01-13 21:56:17 +00:00
jacksonmj
a23138fbbe Fix permanent stickman death. 2011-01-13 20:17:05 +00:00
jacksonmj
def10c41ae Exaggerate convection, misc rearrangement + fixes 2011-01-13 15:24:01 +00:00
Cracker64
cc4489ff29 line for portals. wifi channels reset on reload. 2011-01-12 12:15:50 -05:00
Cracker64
f242566e30 fix QRTZ spot saving, rotate should change FAN vector as well 2011-01-10 09:43:16 -05:00
Cracker64
6b06d37ca5 update with simon, and some other changes from jacksonmj. 2011-01-08 21:23:46 -05:00
Cracker64
a6fe456cd0 only add .15 to PUMP, so that things at absolute 0 load at 0. 2011-01-08 18:12:26 -05:00
jacksonmj
fa1868314c Shrink GOL wrapping code. GSPEED now works. 2011-01-07 18:15:36 +00:00
jacksonmj
ed8c0031f4 Astyle. 2011-01-06 22:26:31 +00:00
Simon
6eafb157de Kiosk mode improvements 2011-01-06 08:56:28 +00:00
Simon
2a3af54e92 Kiosk mode, full screen. requested by dante3rd 2011-01-06 08:55:10 +00:00
Simon
71c5d53f7f Changes by cracker 2011-01-05 19:42:31 +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
Cracker64
5a37f32ca1 update with simon, and shift-v now does every other frame properly 2011-01-04 13:26:28 -05:00
Simon
43065ba94c Fixes crappiness 2011-01-04 18:05:31 +00:00
Simon
85138b970d Make frame-capture a little more noob-friendly 2011-01-04 18:00:28 +00:00
Simon
3a2bc76643 Gravity control by Moach 2011-01-04 13:35:16 +00:00
Cracker64
8604d27c7a simon updates, and SING improvements 2010-12-30 14:59:39 -05:00
Simon
e8c6b37550 Bit of readability 2010-12-30 10:04:20 +00: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
c913fd55d3 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-29 22:24:29 +00:00
Cracker64
8df470662f ARAY gets colored by FILT, woo 2010-12-29 17:22:18 -05:00
Simon
3715925dd9 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-29 21:15:40 +00:00
Cracker64
5766f9aa7e 'd' and 's' will work normally if there is no stickman, otherwise shift-d and shift-s, corrected silly mistake 2010-12-29 14:35:38 -05: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
c5c88529c2 slight temp loading change so PUMP will load with 0C if saved at 0C. fix visual studio compiling 2010-12-26 09:47:25 -05:00
Simon
bd9b01c3e2 Cracker Merge 2010-12-22 18:17:06 +00: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
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
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
FacialTurd
6f928009ed Possible crash, fix from cracker64. 2010-12-13 04:34:57 -08:00
Cracker64
23f828135a updated with icons, and some more fixes. 2010-12-12 20:13:05 -05:00
Simon
f1df4cae6a Merge latest cracker changes 2010-12-12 12:24:38 +00: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
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
cbf41389a2 Bugfix for wifi, would cause a double spark if timed just right. updated to 2010-12-08 12:14:02 -05:00
Simon
96da331601 Improved pause flag, will now only pause, not unpause the game 2010-12-08 01:15:00 +00:00
Simon
9486b96368 Mystery bug, just to make sure 2010-12-07 21:45:12 +00:00
Simon
ac8701eb30 Fix fan loading and remove delete button on favourite view 2010-12-07 21:40:17 +00:00
Simon
2bd851e148 Fixes for potential crashes 2010-12-07 21:16:04 +00:00
Simon
76b6a886b3 Fix BCLN saving 2010-12-07 21:05:26 +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
0dee48278f Upped uitext buffer to 255 chars to allow for longer messages, buffer overflow sometimes occurs with combinations of CAP-LOCKS and grid. 2010-12-06 23:12:49 +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
1eeda3f5cc ANAR, behaves opposite of dust. fix fuse loading, floodfilling of neut/photons. 2010-11-25 01:01:28 -05:00
Philip
60e4c076cb floodfill fix, @_@ elements, grav changes color 2010-11-22 15:36:24 -05: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
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
ebcded767e First release of the mod 2010-11-12 12:46:02 -05:00
Philip
c23938eb6a Nothing display, for pilojo, called it cracker display for lulz, also won the race against antb, which didnt last long, he went on a baloon trip. 2010-11-11 21:38:43 -05:00
Philip
83cd8c7979 Slight changes, added some comments 2010-11-09 17:41:54 -05:00
Philip
febd9be627 Added 3 more life types 2010-11-09 01:04:59 -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
cbe3ed49c4 Removed old fix, not needed. And fixed loading of other saves with GoL particles on screen 2010-11-07 13:34:09 -05: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
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
Felix Wallin
c3a0a9262c how did that get in there? 2010-11-03 11:51:53 +01:00
Felix Wallin
175b37d239 added debug flag 2010-11-03 11:50:48 +01:00
Philip
443a861eaf forgot parentheses... 2010-11-02 23:20:56 -04:00
Philip
6c747bb350 Fix for ctrl-shift-alt click crash incase someone did it for some reason. 2010-11-02 21:39:06 -04:00
Philip
4e46f51bcf changed moving sign code so it doesn't modify the sign itself. 2010-11-01 23:56:06 -04:00
Philip
176ecb1197 eraser uses shift-alt instead of alt because linux alt-click is normally move window 2010-11-01 17:37:27 -04:00
Philip
bff5961d60 updating 2010-10-28 19:18:06 -04: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
79767f4ceb Client Side 'Favourites' UI stuff 2010-10-14 18:33:47 +01:00
Simon
38742f08ba Fixed Powered clone saving and suitibility as a light emitter. Fixed Photons igniting Insulator 2010-10-05 18:48:40 +01:00
Simon
f2fbd1728f fixes saves for photons & makes GLOW a laser gain medium - Skylark 2010-10-04 10:52:27 +01:00
Philip
e4f9f77de9 Updating 2010-10-04 00:29:37 -04:00
Felix Wallin
6e81c2a88c Added reflection, thanks to Skylark 2010-10-02 17:59:24 +02:00
Felix Wallin
58d710b224 layout change 2010-09-27 12:53:05 +02:00