summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-22Merge ../forks into testingAlex1-389/+474
2010-08-22we're done! finally done! stupid merging -____-Alex3-125/+186
2010-08-22w00t, mergedAlex1-9/+105
2010-08-22work pleaseAlex1-0/+10949
2010-08-22Merge ../simonAlex0-0/+0
2010-08-21Added Liquid Oxygen, Oxygen, Tweaked some more values.Ant2-76/+84
2010-08-21Think I fixed DESL/STNE bug, Changed some FOAM leftovers to INSU, Added Coal ↵Ant1-72/+84
(Slow burning solid fuel), Made DESL burn a bit slower too. TODO: Tweak Values a bit more for pressurising WOOD to COAL.
2010-08-20Merge branch 'master' of github.com:antb/The-Powder-ToyAnt1-366/+381
2010-08-20Stickman bottom edge fix (savask)FacialTurd1-366/+381
2010-08-20Added Diesel [DESL] to replace OILs relationship with GAS. Recommit to undo ↵Ant1-1/+1
merge with FacialTurd's
2010-08-20Added Diesel [DESL] to replace OILs relationship with GAS.Ant2-68/+91
2010-08-20Tweaked values of plasic and removed GAS-> OIL assosiations I missed, Reason ↵Ant1-12/+5
for removeal is PLAS melts at 250, OIL vaporised at a much lower temp meaning PLAS would "melt" into GAS.
2010-08-20Stickman bottom edge fix (savask)FacialTurd1-366/+381
2010-08-20Added PLAStic, removed the relationship between OIL and GAS, Plastic is ↵Ant1-70/+91
created from pressurised OIL and melts back into OIL. May need values tweeking on lines 1493, 1576 and 1579
2010-08-19changed PT_METL to PT_STNE and PT_WIRE to PT_METL so it makes senseAlex1-20/+20
2010-08-19Fix typing error that broke autoupdateSimon1-1/+1
2010-08-18Version 41.3, bug fixes for Insl and SwchSimon2-24/+34
2010-08-15Move fancy effects to a new colour modeSimon2-47/+61
2010-08-17astyleFelix Wallin1-378/+378
2010-08-17glass now worksFelix Wallin1-4/+4
2010-08-17Merge remote branch 'origin/master'Felix Wallin2-7/+57
2010-08-17fixed acidFelix Wallin1-2/+2
2010-08-17Changes for Windows CompilationSimon2-7/+57
2010-08-17Removed superfluous particle drawings and made blurry stuff Firemode onlySimon1-60/+12
2010-08-17Changes to particle drawing (zc00gii)Simon1-9/+15
2010-08-17fix mwax bugAlex1-3/+15
2010-08-17fix gasAlex1-1/+1
2010-08-17Fixed photons spawning, but it's still have some bugs.savask1-347/+362
2010-08-17now weak diffusion for molten wax.Felix Wallin2-7/+20
2010-08-16(no commit message)FacialTurd1-0/+1
2010-08-16added roadmap, feel free to changeFelix Wallin1-0/+7
2010-08-16wwopsFelix Wallin1-0/+10781
2010-08-16now?Felix Wallin1-10781/+0
2010-08-16testFelix Wallin1-0/+0
2010-08-16what about nowFelix Wallin1-4/+4
2010-08-16git failsFelix Wallin1-4/+4
2010-08-16astyle formattedFelix Wallin1-104/+104
2010-08-16Merge branch 'master' of http://github.com/FacialTurd/The-Powder-ToyFelix Wallin1-10879/+0
2010-08-16change a tad bitAlex1-8/+8
2010-08-16weeAlex1-1/+0
2010-08-16.orig? NOT IT MY GITSimon1-10879/+0
2010-08-16MERGE\!Alex2-1/+37
2010-08-16backup files.Felix Wallin1-0/+1
2010-08-16LOOPSFacialTurd1-225/+34
2010-08-16merge merge merge mergeAlex2-74/+11012
2010-08-16pretty glow :)Alex1-229/+38
2010-08-16readded inlines, my badief0151-7/+7
2010-08-16> ief015ief0151-8/+66
-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-16changesFelix Wallin2-130/+11177
2010-08-16added glow-ish uran and plutAlex1-0/+168