jacksonmj
|
6a2f357efd
|
Revert "Pass decorations to saving functions (doesn't actually save yet)"
This reverts commit 7fe99f3210 .
Conflicts:
src/main.c
|
2011-05-29 13:34:37 +01:00 |
|
Simon Robertshaw
|
577ad4eb47
|
Gravity state now saved
|
2011-05-28 18:54:12 +01:00 |
|
Simon Robertshaw
|
380a45a4c9
|
Image resampling for thumbnails
|
2011-05-28 14:19:01 +01:00 |
|
Simon Robertshaw
|
2c7b8a6902
|
Fix renderer, add image decode/code methods
|
2011-05-28 13:49:07 +01:00 |
|
Simon Robertshaw
|
5919cefa85
|
Decorations are per particle TODO: remove references to the decorations buffer
|
2011-05-27 14:44:56 +01:00 |
|
Simon Robertshaw
|
a52344f399
|
Decorations improvements
|
2011-05-24 15:01:18 +01:00 |
|
Simon Robertshaw
|
453c69d39a
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2011-05-24 14:55:29 +01:00 |
|
Simon Robertshaw
|
eafcdf8ec9
|
Improve error handling on display initialisation
|
2011-05-24 14:54:14 +01:00 |
|
jacksonmj
|
956218736b
|
Fix a few solids affected by n-gravity
|
2011-05-24 21:49:09 +08:00 |
|
jacksonmj
|
fc4de9640c
|
Fix sim options description, GOO and DEUT
|
2011-05-24 21:49:08 +08:00 |
|
Simon Robertshaw
|
128e8c1ff8
|
Version increment
|
2011-05-20 13:04:52 +01:00 |
|
Simon Robertshaw
|
dadac37264
|
Move Diamond into solids menu, add gravity elements
|
2011-05-20 13:00:34 +01:00 |
|
Simon Robertshaw
|
811fe61881
|
Version increment
|
2011-05-19 15:59:18 +01:00 |
|
Simon Robertshaw
|
9d70d60ee9
|
New message notification on session check TODO: Clickable link to conversations on website
|
2011-05-16 12:46:08 +01:00 |
|
Simon Robertshaw
|
1ddff1ad3b
|
Runtime fullscreen toggle TODO: Fix bug that prevents from closing the window after a fullscreen toggle
|
2011-05-15 20:40:08 +01:00 |
|
Simon Robertshaw
|
2daf61f702
|
Put menu_wall back into interface.c to fix crackers colour menu
|
2011-05-14 13:57:49 +01:00 |
|
Cracker64
|
9d20d6af82
|
Decoration has a color menu. GoL uses less memory(17MB less), and probably a bit faster.
|
2011-05-14 13:46:10 +01:00 |
|
jacksonmj
|
c4140955de
|
Life decrement property for soap
|
2011-05-14 13:44:33 +01:00 |
|
jacksonmj
|
7fe99f3210
|
Pass decorations to saving functions (doesn't actually save yet)
|
2011-05-14 13:44:02 +01:00 |
|
jacksonmj
|
cbfc73d8d6
|
Turn WIND into a tool
|
2011-05-14 13:43:51 +01:00 |
|
jacksonmj
|
26dbf70709
|
Fix overlapping particles
|
2011-05-14 13:39:40 +01:00 |
|
Simon Robertshaw
|
fa54c005b2
|
Use properties for life decrement/kill
|
2011-05-14 13:38:52 +01:00 |
|
jacksonmj
|
c23124e0d7
|
Shrink draw_tool_xy
|
2011-05-14 13:28:24 +01:00 |
|
Simon Robertshaw
|
16f014b06a
|
Move wall drawing to graphics.c
|
2011-05-14 13:28:02 +01:00 |
|
Simon Robertshaw
|
ee962dc8bb
|
Newtonian gravity toggle, disabled by default
|
2011-05-12 18:04:29 +01:00 |
|
Cracker64
|
59bd280fad
|
ANAR changes, WHOL absorbs ANAR and gets colder. ANAR burns with CFLM strangely.
|
2011-05-05 20:38:30 +01:00 |
|
Simon Robertshaw
|
5aefd0cb01
|
Initial soap commit
|
2011-05-05 20:14:35 +01:00 |
|
Simon Robertshaw
|
061d6ba7af
|
Gravity: only calculate the difference
|
2011-04-26 16:15:23 +01:00 |
|
Simon Robertshaw
|
b26648e6ae
|
Fix pause with gravity and test deuterium improvements
|
2011-04-25 20:41:45 +01:00 |
|
Cracker64
|
24f5905020
|
portal now uses particles as storage, so it keeps everything.
|
2011-04-25 19:00:27 +01:00 |
|
Simon Robertshaw
|
28d9328959
|
Dialog box for changing simulation options, gravity toggle needs implementing
|
2011-04-25 16:39:28 +01:00 |
|
jacksonmj
|
7b82eae82e
|
Jacksonmj: Move console functions into seperate file
|
2011-04-25 12:07:55 +01:00 |
|
Simon Robertshaw
|
3acf9aae2a
|
Asynchronous thread for gravity processing
|
2011-04-24 17:49:33 +01:00 |
|
Cracker64
|
bd8de4c842
|
Decorations! ,still messing with it. It does not save currently. TODO: fix typing in boxes to update the color. Line/box tools. Some basic color selections like an element menu.
|
2011-04-23 14:00:51 +01:00 |
|
Simon Robertshaw
|
55301b70dc
|
Forgot something for gravity
|
2011-04-22 17:06:44 +01:00 |
|
Simon Robertshaw
|
13ff21bb22
|
Gravitaaaay (Needs tweeking for performance)
|
2011-04-22 17:06:09 +01:00 |
|
Cate
|
5fd31116a0
|
Added IRON to Prop_heatglowsomething. :D So it doesn't look as weird when it comes out of lava. Just a visual touch.
|
2011-04-19 18:09:46 +01:00 |
|
Simon
|
d37bd56eb6
|
'M' For selected element swap, 'dae' var for showing a selected element box upon element change (not implemented)
|
2011-04-17 20:34:54 +01:00 |
|
Simon
|
5c8a6f3af8
|
Increment version
|
2011-04-17 14:07:51 +01:00 |
|
Simon
|
67531c2434
|
Game save renderer
|
2011-04-12 12:19:21 +01:00 |
|
Simon
|
9d71597df9
|
Increment version
|
2011-04-10 12:10:11 +01:00 |
|
Simon
|
626cc8fa6a
|
Remove a TON of warnings
|
2011-04-08 15:28:57 +01:00 |
|
Simon
|
c51c31c12d
|
IRON now in menu
|
2011-04-08 14:47:08 +01:00 |
|
Simon
|
7277175da0
|
Increment version
|
2011-04-08 13:57:05 +01:00 |
|
jacksonmj
|
40c4dde34a
|
Document icons for linux
|
2011-04-08 11:11:30 +01:00 |
|
jacksonmj
|
4aeac8b316
|
Also register .stm extension in Windows
|
2011-04-08 11:10:52 +01:00 |
|
Simon
|
767d73c5fc
|
astyle
|
2011-04-08 11:09:42 +01:00 |
|
Simon
|
8872a1065b
|
Move copybox into its own control
|
2011-04-04 20:02:11 +01:00 |
|
AntB
|
db406494bd
|
Added H2:
Will reduce DESL to WATR and OIL under pressure
Will fuse with O2 under pressure to make WATR
|
2011-04-04 23:18:26 +08:00 |
|
jacksonmj
|
90f8c4f483
|
error_ui: wrap text and change message box height to fit
Stops banned user message overflowing out of message box
|
2011-04-04 16:11:37 +01:00 |
|
Simon
|
630ab09f63
|
Copy text UI
|
2011-04-01 22:26:29 +01:00 |
|
Simon
|
b7a004986f
|
A cracker commit with some nice comments
|
2011-03-30 18:57:49 +01:00 |
|
Simon
|
f1667bf88e
|
Added exe_name to update.h
|
2011-03-30 17:52:50 +01:00 |
|
Simon
|
d48f7fc73a
|
O2 header changes
|
2011-03-29 19:20:46 +01:00 |
|
Cracker64
|
53bc3b817d
|
QRTZ grow changes, uses ctype.
|
2011-03-29 18:25:11 +01:00 |
|
Simon
|
812798d70d
|
64bit fixes and other
|
2011-03-29 17:47:53 +01:00 |
|
Lieuwe
|
3d71ab5582
|
64bit fixes, thanks a ton jacksonmj :D
|
2011-03-26 16:45:38 +01:00 |
|
Lieuwe
|
05730797d8
|
misc stuff
|
2011-03-26 16:40:03 +01:00 |
|
Simon
|
a589f78429
|
... and wood
|
2011-03-25 11:46:17 +00:00 |
|
Simon
|
eb5826c3da
|
Fix neutron penetration for PLANT
|
2011-03-25 11:44:20 +00:00 |
|
Simon
|
66edafa4fa
|
Added some file association for Windows, NOT TESTED YET
|
2011-03-25 11:10:01 +00:00 |
|
Simon
|
a186714a7f
|
Move thunder to explosive
|
2011-03-24 21:11:46 +00:00 |
|
Simon
|
3639fd96b1
|
Move Portal to special and Photons to nuclear
|
2011-03-24 20:19:26 +00:00 |
|
Simon
|
635ad0afdc
|
M_PI for those who aren't awesome enough for Pi
|
2011-03-24 20:01:15 +00:00 |
|
Simon
|
3ab47ae9d7
|
Effects for PRTO and PRTI
|
2011-03-24 19:41:45 +00:00 |
|
Simon
|
2e401babb7
|
Python console
|
2011-03-22 17:58:52 +00:00 |
|
Simon
|
c096b2b14a
|
More cracker fixes
|
2011-03-22 17:25:29 +00:00 |
|
Simon
|
7d56b33589
|
Fix some WIND bugs
|
2011-03-22 17:14:45 +00:00 |
|
Lieuwe
|
295626563f
|
64bit fixing shit
|
2011-03-20 17:46:29 +01:00 |
|
jacksonmj
|
d46a3bdcb0
|
Better rotation and inversion, also does single pixel translation
|
2011-03-18 19:33:38 +00:00 |
|
jacksonmj
|
d924a5554a
|
Matrices and vectors, to make coding next commit more pleasant
|
2011-03-18 19:33:10 +00:00 |
|
Lieuwe
|
7e27282b92
|
you can now disable(tpt.disable_python) or enable(python) the python console :D
|
2011-03-18 19:42:23 +01:00 |
|
Lieuwe
|
96959503cd
|
now warns about a disabled python console.
|
2011-03-18 19:02:09 +01:00 |
|
Lieuwe
|
8b22ca5064
|
no longer crashes on mangled console.py and other python initialisation errors.
|
2011-03-18 17:23:08 +01:00 |
|
jacksonmj
|
56f966b4db
|
Add some arguments to save build/parse functions
To make clipboard manipulation easier.
|
2011-03-18 12:41:36 +00:00 |
|
jacksonmj
|
495eda27a5
|
Update icon.h to match icon image files
|
2011-03-18 00:13:56 +00:00 |
|
Lieuwe
|
b4a3b12d3d
|
broke stuff
|
2011-03-16 16:53:20 +01:00 |
|
Lieuwe
|
fe5e4a6ddc
|
64bit really fixed now, does need PYEXT to be defined tho.
|
2011-03-15 20:09:23 +01:00 |
|
Lieuwe
|
34051303cf
|
no need to include tpt_console.py on 64bit anymore.
|
2011-03-15 19:18:31 +01:00 |
|
jacksonmj
|
db91bd37f0
|
Display photon wavelengths in HUD
|
2011-03-15 15:47:09 +00:00 |
|
Lieuwe
|
c33f6adae7
|
added #define PYEXT so you can use an external tpt_console.py on 64bit OSes
|
2011-03-13 18:45:40 +01:00 |
|
Cracker64
|
3b048f8a06
|
merge merge merge
|
2011-03-10 15:43:27 -05:00 |
|
Lieuwe
|
db07c1ee0c
|
added #define to disable PYCONSOLE
|
2011-03-09 15:41:50 +01:00 |
|
Lieuwe
|
51f994f8d5
|
COMMIT DAMNIT
|
2011-03-06 21:08:18 +01:00 |
|
Lieuwe
|
f599959efe
|
more work on the chat client, it now supports nick changes
|
2011-03-06 15:39:50 +01:00 |
|
Lieuwe
|
11a7be5c68
|
added irc client extension, it only listens for now.
|
2011-03-05 21:41:11 +01:00 |
|
Lieuwe
|
d6d661c434
|
keyboard/mouse handling
|
2011-03-05 20:08:41 +01:00 |
|
Lieuwe
|
20b6a64228
|
moar graphics stuff
|
2011-03-05 17:50:05 +01:00 |
|
Lieuwe
|
5cb538f081
|
got draw_pixel and draw_text to work
|
2011-03-05 17:09:37 +01:00 |
|
Lieuwe
|
6596155c8a
|
trying to get a putpixel command working but it segfaults atm
|
2011-03-05 15:54:47 +01:00 |
|
Lieuwe
|
85a2ba9a6e
|
implemented a step hook and modified the makefile to call getheader.py
|
2011-03-05 15:09:15 +01:00 |
|
Lieuwe
|
fc70b5bb78
|
tpt_console.py now internal
|
2011-03-03 21:12:57 +01:00 |
|
Lieuwe
|
eab871c774
|
getheader now compiles python files
|
2011-03-03 20:33:48 +01:00 |
|
jacksonmj
|
ded7bdf30d
|
Merge branch 'upstream' into dev
Conflicts:
src/main.c
|
2011-02-26 19:32:51 +00:00 |
|
Lieuwe
|
5387f235f9
|
python console
|
2011-02-26 11:49:23 +01:00 |
|
Simon
|
fd6f6c5406
|
WIND from cracker!
|
2011-02-24 17:11:05 +00:00 |
|
Cracker64
|
bf24a26139
|
forgot powder.h, and renamed drag to wind
|
2011-02-24 00:51:09 -05:00 |
|
Simon
|
5d4d815ad3
|
Fancier glow, now affected by Velocity, Pressure and Heat
|
2011-02-23 20:35:02 +00:00 |
|
Simon
|
fa76c4b45c
|
Increase minor version
|
2011-02-23 17:16:13 +00:00 |
|
Cracker64
|
a8439f221e
|
updating
|
2011-02-22 20:55:09 -05:00 |
|