Alex
e5bb3c9869
Merge ../forks into testing
2010-08-22 12:57:55 -04:00
Alex
eaa6dbffdd
we're done! finally done! stupid merging -____-
2010-08-22 12:57:45 -04:00
Alex
7ee9deede6
w00t, merged
2010-08-22 12:17:15 -04:00
Alex
c104517027
work please
2010-08-22 11:53:43 -04:00
Alex
a20a333e99
Merge ../simon
2010-08-22 11:32:29 -04:00
Ant
858918b201
Added Liquid Oxygen, Oxygen, Tweaked some more values.
2010-08-21 16:29:16 +01:00
Ant
22c6a67595
Think I fixed DESL/STNE bug, Changed some FOAM leftovers to INSU, Added Coal (Slow burning solid fuel), Made DESL burn a bit slower too. TODO: Tweak Values a bit more for pressurising WOOD to COAL.
2010-08-21 06:57:49 +01:00
Ant
520208f469
Merge branch 'master' of github.com:antb/The-Powder-Toy
2010-08-20 20:54:35 +01:00
FacialTurd
8768223f46
Stickman bottom edge fix (savask)
2010-08-21 03:52:56 +08:00
Ant
ce36e304bb
Added Diesel [DESL] to replace OILs relationship with GAS. Recommit to undo merge with FacialTurd's
2010-08-20 20:50:53 +01:00
Ant
873dfea74d
Added Diesel [DESL] to replace OILs relationship with GAS.
2010-08-20 20:33:41 +01:00
Ant
dbba90eb01
Tweaked values of plasic and removed GAS-> OIL assosiations I missed, Reason for removeal is PLAS melts at 250, OIL vaporised at a much lower temp meaning PLAS would "melt" into GAS.
2010-08-20 16:56:52 +01:00
FacialTurd
68e09b72bb
Stickman bottom edge fix (savask)
2010-08-20 05:25:27 -07:00
Ant
e2744b1d4d
Added PLAStic, removed the relationship between OIL and GAS, Plastic is created from pressurised OIL and melts back into OIL. May need values tweeking on lines 1493, 1576 and 1579
2010-08-20 02:04:07 +01:00
Alex
392bf0c894
changed PT_METL to PT_STNE and PT_WIRE to PT_METL so it makes sense
2010-08-19 12:28:26 -04:00
Simon
580a76a79f
Fix typing error that broke autoupdate
2010-08-19 10:50:05 +01:00
Simon
08f98b5f6a
Version 41.3, bug fixes for Insl and Swch
2010-08-18 18:55:50 +01:00
Simon
04d6a8051b
Move fancy effects to a new colour mode
2010-08-15 08:43:31 +01:00
Felix Wallin
52d64e6132
astyle
2010-08-17 15:03:29 +02:00
Felix Wallin
8b9ab03c14
glass now works
2010-08-17 14:59:03 +02:00
Felix Wallin
0a8ce142ef
Merge remote branch 'origin/master'
2010-08-17 14:56:25 +02:00
Felix Wallin
5f46d7e63e
fixed acid
2010-08-17 14:55:38 +02:00
Simon
5a41f64a08
Changes for Windows Compilation
2010-08-17 13:38:43 +01:00
Simon
7076587196
Removed superfluous particle drawings and made blurry stuff Firemode only
2010-08-17 13:10:17 +01:00
Simon
97fc7ce330
Changes to particle drawing (zc00gii)
2010-08-17 12:51:55 +01:00
Alex
59fccc35fd
fix mwax bug
2010-08-17 19:00:11 +08:00
Alex
d6c0211c54
fix gas
2010-08-17 19:00:10 +08:00
savask
ec1ab3fbcf
Fixed photons spawning, but it's still have some bugs.
2010-08-17 18:59:05 +08:00
Felix Wallin
887895624c
now weak diffusion for molten wax.
2010-08-17 10:23:01 +02:00
FacialTurd
d430a352a1
2010-08-16 15:35:50 -07:00
Felix Wallin
346e1554e0
added roadmap, feel free to change
2010-08-16 23:49:32 +02:00
Felix Wallin
7dd9ed37c3
wwops
2010-08-16 23:34:27 +02:00
Felix Wallin
c21d8a371a
now?
2010-08-16 23:31:11 +02:00
Felix Wallin
435e36538f
test
2010-08-16 23:30:48 +02:00
Felix Wallin
60e58a7e6b
what about now
2010-08-16 23:26:08 +02:00
Felix Wallin
a828723cb2
git fails
2010-08-16 23:22:38 +02:00
Felix Wallin
802e7705a2
astyle formatted
2010-08-16 23:18:29 +02:00
Felix Wallin
1a4a51ed11
Merge branch 'master' of http://github.com/FacialTurd/The-Powder-Toy
2010-08-16 23:16:32 +02:00
Alex
664e15215d
change a tad bit
2010-08-16 17:13:46 -04:00
Alex
362d72f0d3
wee
2010-08-16 17:11:50 -04:00
Simon
55e731c756
.orig? NOT IT MY GIT
2010-08-16 21:54:12 +01:00
Alex
b65fc882ca
MERGE\!
2010-08-16 16:53:58 -04:00
Felix Wallin
5826279c6d
backup files.
2010-08-16 22:52:22 +02:00
FacialTurd
9866b8d24b
LOOPS
2010-08-16 13:47:18 -07:00
Alex
a7acf80787
merge merge merge merge
2010-08-16 16:36:13 -04:00
Alex
b56d7a4e1e
pretty glow :)
2010-08-16 16:32:15 -04:00
ief015
bdcb960ee5
readded inlines, my bad
2010-08-16 16:23:46 -04:00
ief015
1682788324
> ief015
...
-Ctrl+Z Undo (ctrl+z will only to revert to the undo state, there is no redo, though I can change this if it becomes necessary)
-I don't know what those inline keywords were for, but they were causing errors.
2010-08-16 16:09:22 -04:00
Felix Wallin
b897349aa7
changes
2010-08-16 21:50:35 +02:00
Alex
f6170777a1
added glow-ish uran and plut
2010-08-16 15:45:41 -04:00
