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 |
|