Felix Wallin
|
307e329dd7
|
forgot one file
|
2010-09-27 12:56:56 +02:00 |
|
Felix Wallin
|
9ca6983e35
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2010-09-27 12:56:23 +02:00 |
|
Felix Wallin
|
07283c6f55
|
Try to automerge with this, haha
|
2010-09-27 12:55:39 +02:00 |
|
Felix Wallin
|
99e2782ebc
|
Try to automerge with this, haha
|
2010-09-27 12:54:56 +02:00 |
|
Felix Wallin
|
58d710b224
|
layout change
|
2010-09-27 12:53:05 +02:00 |
|
Alex
|
1401817f21
|
fixed fuse bug
|
2010-09-26 19:28:18 -04:00 |
|
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
|
3156779da9
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2010-09-25 19:12:34 +01:00 |
|
Simon
|
c7dab50b51
|
Add Anti-Matter
|
2010-09-25 19:11:25 +01:00 |
|
FacialTurd
|
fffb5300d0
|
|
2010-09-25 04:07:55 -07: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 |
|
Simon
|
d43b5a4fd8
|
Fix Thermite and Stickman reload glitch
|
2010-09-22 16:01:49 +01:00 |
|
Simon
|
c12cdce5b6
|
UI stuff for history
|
2010-09-19 17:13:06 +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
|
2ba8be7e49
|
Improved Thermograph gradient
|
2010-09-16 17:58:55 +01:00 |
|
Simon
|
423070a8a1
|
Fix Part_avg function and COAL, temperature signs
|
2010-09-16 13:37:53 +01:00 |
|
Simon
|
a92da37559
|
History almost complete, couple of bug fixes
|
2010-09-13 22:36:43 +01:00 |
|
Simon
|
812cf13ed2
|
Half-Implemented history
|
2010-09-11 22:11:05 +01:00 |
|
Simon
|
42ec12d02f
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2010-09-11 11:57:20 +01:00 |
|
Felix Wallin
|
863be4ae58
|
no idea what I changed, check commit
|
2010-09-10 22:48:19 +02:00 |
|
Felix Wallin
|
c083860ea1
|
added some opengl stuff, strange bug with rendering it tho
|
2010-09-10 22:33:01 +02:00 |
|
Simon
|
d640bd26d8
|
Some changes
|
2010-09-10 21:13:29 +01:00 |
|
Felix Wallin
|
959f3a24c6
|
added a test blendpixel for opengl. No idea if it works
|
2010-09-10 22:10:41 +02:00 |
|
Felix Wallin
|
b89be21749
|
changed temperature of THDR and PLSM
|
2010-09-10 15:32:49 +02:00 |
|
Felix Wallin
|
89dc0c34c1
|
fixed LN2 freezing.
|
2010-09-10 15:28:53 +02:00 |
|
Felix Wallin
|
17f7caf5d5
|
added auto update and build file.. will see if it works
|
2010-09-07 20:38:08 +02: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
|
a8e1e33605
|
Heat fix
|
2010-09-05 18:34:25 +01:00 |
|
Simon
|
6409b2ae2c
|
OpenGL Blending
|
2010-09-05 11:58:43 +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 |
|
Alex
|
21863c088b
|
made makefile work properly
|
2010-09-04 17:12:41 -04:00 |
|
Felix Wallin
|
a11d647742
|
more work on kelvin
|
2010-09-04 17:40:26 +02:00 |
|
Felix Wallin
|
525f87fd6b
|
Partly converted into Kelvin scale
|
2010-09-04 17:25:44 +02:00 |
|
Felix Wallin
|
d39f8b97a3
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2010-09-04 17:11:12 +02:00 |
|
Felix Wallin
|
81923fae6e
|
Changed O2 diffussion, changed description
|
2010-09-04 16:49:08 +02:00 |
|