Commit Graph

137 Commits

Author SHA1 Message Date
Alex
5b9e554360 fixed BCOL and COAL bug 2010-09-26 19:22:27 -04:00
Alex
82764a9dac done merging 2010-09-26 17:51:08 -04:00
Alex
9c60901ef6 use parts[i].tmp instead of bit hacks 2010-09-26 17:28:27 -04:00
Alex
bf534e1514 Added BCOL, changed FUSE->FSEP 2010-09-26 17:14:51 -04:00
Felix Wallin
2d5558491f astyle again. 2010-09-26 19:50:50 +02:00
Simon
9707323109 Added Powered Clone and Heat Switch 2010-09-26 15:18:03 +01:00
Felix Wallin
0424907d28 atzensty... astyle 2010-09-26 14:00:15 +02:00
Simon
26c67a303e Gah\! 2010-09-26 12:57:02 +01:00
Alex
7341fd9468 merged! 2010-09-26 04:01:14 -04:00
Alex
ddde608d3e half done commiting 2010-09-26 03:37:13 -04:00
Simon
c7dab50b51 Add Anti-Matter 2010-09-25 19:11:25 +01:00
Simon
3d6e7f8f62 Fireworks bugfixes 2010-09-24 16:23:29 +01:00
Simon
6d3fe4344f Few bug-fixes added Fireworks and Cold-flame 2010-09-24 16:07:58 +01:00
Felix Wallin
99ae022d55 astyle 2010-09-18 09:52:14 +02:00
Simon
fa099338bb Fix Coal and DESL 2010-09-17 11:34:24 +01:00
Simon
423070a8a1 Fix Part_avg function and COAL, temperature signs 2010-09-16 13:37:53 +01:00
Simon
812cf13ed2 Half-Implemented history 2010-09-11 22:11:05 +01:00
Simon
d640bd26d8 Some changes 2010-09-10 21:13:29 +01:00
Felix Wallin
19cf0df2df Astyle 2010-09-07 08:39:16 +02:00
FacialTurd
6abf6602b3 2010-09-06 15:07:14 -07:00
Simon
6b27bc06ff Fix METL heating NTCT or PTCT through insulator 2010-09-06 14:30:09 +01:00
Simon
e4d256a0ee Added Glow and Brick, fix some oil stuff and fix LCRY 2010-09-06 11:46:11 +01:00
Simon
719ad7c359 Fire only turns into smoke when cold, fix neutrons 2010-09-05 11:44:22 +01:00
Simon
240eb4ba33 Stickman fixes from savask and temperature fixes 2010-09-05 11:35:38 +01:00
Felix Wallin
a11d647742 more work on kelvin 2010-09-04 17:40:26 +02:00
Simon
274383105a Revert "does not compile at the moment, cause unknown, also. always use // for one line comments"
This reverts commit 32b1a2c3ab.
2010-09-03 00:06:18 +01:00
Felix Wallin
32b1a2c3ab does not compile at the moment, cause unknown, also. always use // for one line comments 2010-09-02 22:59:48 +02:00
Simon
cf85eabee9 Fixed zoom, removed plastic, fixed oil, more moving around. Experimental Neutron behaviour 2010-09-01 11:40:29 +01:00
Simon
75d3e18fbf Rendering bugfixes, added Thermite 2010-08-29 15:37:22 +01:00
Simon
c0563111f8 Include some headers and move some functions 2010-08-29 10:25:53 +01:00
Simon
a23f377731 Even more work, something broke though 2010-08-28 11:40:49 +01:00
Alex
0d25cae647 changed some defines to make more sense 2010-08-26 14:09:38 -04:00
Simon
bb88587d9d More rearrangement, particle drawing in own function 2010-08-26 14:46:56 +01:00
Simon
f426ee42e7 More re-arranging 2010-08-26 12:38:24 +01:00
Simon
72a1d17fe4 This build works, but still a work in progress 2010-08-26 12:20:16 +01:00
Simon
5751fea35f More work 2010-08-26 10:53:15 +01:00
Simon
470519c92e Seperation WIP 2010-08-25 12:22:41 +01:00
Simon
8d089bba50 Yeast 2010-08-24 21:01:04 +01:00
Simon
5e032885a2 Fix everything 2010-08-24 19:58:17 +01:00
Alex
26c7944d64 changed LOX to LO2 2010-08-24 12:32:37 -04:00
Alex
eb063c8e07 made PT_HSCN and PT_CSCN PT_NTCT and PT_PTCT respectfully 2010-08-23 17:55:17 -04:00
Alex
98835f2259 fix gravity 2010-08-23 17:40:31 -04:00
Alex
ddfcb7c9f6 added um3k's INWR 2010-08-23 09:39:02 -04:00
Justin K Phillips
c896dc7090 Added new element PT_INWR 2010-08-22 16:55:07 -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
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