Simon
|
050f71fbab
|
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
|
2011-04-04 16:26:29 +01:00 |
|
Simon
|
a1b1308039
|
Document icon
|
2011-04-04 16:25:48 +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
|
4d80abc399
|
Fix neutrons crash
Also fix neutrons causing unwanted movement of parts[0]
|
2011-04-04 16:12:52 +01:00 |
|
jacksonmj
|
63089242a5
|
Successful deletion is not an error
|
2011-04-04 16:12:13 +01: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 |
|
jacksonmj
|
45b1b2bc96
|
Fix banned user message
error_ui does not support separate title text
|
2011-04-04 16:11:16 +01:00 |
|
jacksonmj
|
bff7d73a64
|
Fix crashes when pasting on top of walls
|
2011-04-04 16:11:05 +01:00 |
|
jacksonmj
|
68f9b59f08
|
Use floats for temperature in both consoles (old and python)
|
2011-04-04 16:10:54 +01:00 |
|
jacksonmj
|
e18480006e
|
Clear particle data in parse_save
Fixes QRTZ sometimes growing when copied and pasted
|
2011-04-04 16:10:41 +01:00 |
|
jacksonmj
|
0232fc9301
|
Use floats for vx,vy in old console
|
2011-04-04 16:10:28 +01:00 |
|
jacksonmj
|
d2d3956e72
|
Improved frame rate limiting
|
2011-04-04 16:10:20 +01:00 |
|
jacksonmj
|
592b923b66
|
Finish WIN32 register_extension, fix Visual Studio compile
|
2011-04-04 16:10:03 +01:00 |
|
Simon
|
651208c5fb
|
Prevent dust residue from FWRK
Conflicts:
src/powder.c
|
2011-04-04 16:09:05 +01:00 |
|
jacksonmj
|
cf00540303
|
Restore new stamp manipulation
Overwritten by: Python console 2e401babb7
|
2011-04-04 16:06:35 +01:00 |
|
jacksonmj
|
a5f01099d7
|
console2345 always evaluates to true, check string is not empty instead
Also, initialise to empty strings - if sscanf does not find something to
put in a string, it will leave it unchanged.
|
2011-04-04 16:06:23 +01:00 |
|
Simon
|
a5e07a787c
|
Less glow for Portal
|
2011-04-02 16:00:39 +01:00 |
|
Simon
|
db2937ec79
|
More random explosion
|
2011-04-02 15:25:50 +01:00 |
|
Simon
|
f6b93f9ab6
|
Copy support for OS X
|
2011-04-02 00:00:19 +01:00 |
|
Simon
|
630ab09f63
|
Copy text UI
|
2011-04-01 22:26:29 +01:00 |
|
Simon
|
40abad4cca
|
Fix Neutrons and clone types
|
2011-04-01 15:21:11 +01:00 |
|
Simon
|
a7d5239738
|
Added session check fallback
|
2011-04-01 10:41:09 +01:00 |
|
Simon
|
1dee7a8da2
|
Fixed console message
|
2011-04-01 10:37:27 +01:00 |
|
Simon
|
c7b441602f
|
More PYCONSOLE macros
|
2011-04-01 10:19:44 +01:00 |
|
Simon
|
2f6bc8fe80
|
Move pygood and pyready outside of macro
|
2011-04-01 10:14:53 +01:00 |
|
Simon
|
9c44767e44
|
Move console_more declaration outside pythonconsole macro
|
2011-04-01 10:08:54 +01:00 |
|
Cracker64
|
96b93d0964
|
forgot to remove some EQVE stuff, wasn't working
|
2011-03-30 18:58:17 +01:00 |
|
Cracker64
|
8fc59be944
|
set_vx and vy fixes, float to int is not good.
|
2011-03-30 18:58:07 +01:00 |
|
Simon
|
b7a004986f
|
A cracker commit with some nice comments
|
2011-03-30 18:57:49 +01:00 |
|
Simon
|
3863a75877
|
URHG
|
2011-03-30 18:04:51 +01:00 |
|
Simon
|
a496862154
|
import header for exe_name for use with file association
|
2011-03-30 17:35:47 +01:00 |
|
Simon
|
03e1582997
|
Windows header for registry functions
|
2011-03-30 17:22:11 +01:00 |
|
AntB
|
a0f61882de
|
derp - added O2.c
|
2011-03-29 19:21:04 +01:00 |
|
AntB
|
f32dd71e0a
|
AMTR updates, releases LESS pressure, generates MORE photons and lifes that little bit longer.
|
2011-03-29 19:12:53 +01:00 |
|
Cracker64
|
53bc3b817d
|
QRTZ grow changes, uses ctype.
|
2011-03-29 18:25:11 +01:00 |
|
Cracker64
|
83590424b0
|
some keyword fixes, "from" is a reserved name.
|
2011-03-29 18:24:08 +01:00 |
|
Cracker64
|
ed244f42cb
|
WIND works with line tool, BOMB shine affected by velocity and flickers
|
2011-03-29 18:23:34 +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
|
d17694dcc6
|
Added Lieuwe
|
2011-03-25 12:03:51 +00:00 |
|
Simon
|
e69c6a4dd3
|
Typo
|
2011-03-25 11:57:04 +00:00 |
|
Simon
|
66edafa4fa
|
Added some file association for Windows, NOT TESTED YET
|
2011-03-25 11:10:01 +00:00 |
|
Simon
|
bc58ff1479
|
Message box with save ID info on new save
|
2011-03-24 21:34:42 +00:00 |
|
Simon
|
35947b644a
|
wtf
|
2011-03-24 21:21:21 +00:00 |
|
Simon
|
6e1e81464e
|
Add outline for clipboard pushing/pulling
|
2011-03-24 21:18:58 +00:00 |
|
Cate
|
175fb60cf7
|
Fixed spacing and fixed "clumping" with quartz generating from life with Cracker help. console: set life qrtz 10000 is very lol
|
2011-03-24 20:10:04 +00:00 |
|
Cate
|
7bfe412e29
|
Cracker suggestion, fixed newly generated Quartz to always have color of previous particle it was created from. Makes cool patterns. Also increased speed.
|
2011-03-24 20:09:32 +00:00 |
|
Simon
|
bb0907bc96
|
Fix underflow/segfault from negative ctypes and debug text
|
2011-03-24 20:08:44 +00:00 |
|
Simon
|
82d0d63be9
|
Awesome QRTZ from Cate
|
2011-03-24 20:06:22 +00:00 |
|
Simon
|
b538a760d0
|
Fix text overflow for large life values
|
2011-03-24 19:57:33 +00:00 |
|
Simon
|
3ab47ae9d7
|
Effects for PRTO and PRTI
|
2011-03-24 19:41:45 +00:00 |
|
Simon
|
fe90c86fa1
|
SING pops when it runs out of life
|
2011-03-24 15:47:44 +00:00 |
|
Simon
|
df005748fc
|
Open file command line
|
2011-03-23 11:54:47 +00:00 |
|
Simon
|
a7f028a62a
|
Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy
|
2011-03-23 11:43:09 +00:00 |
|
jacksonmj
|
32e05a6adc
|
Fix crashes when saving
|
2011-03-22 20:58:17 +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 |
|
Simon
|
cf4572ec5f
|
Fixes from jacksonmj
|
2011-03-22 16:15:41 +00:00 |
|
jacksonmj
|
df27f8420d
|
Fix crash when trying to move to invalid co-ordinates
|
2011-03-21 16:26:58 +00:00 |
|
Lieuwe
|
d7cfbed2cd
|
cleanup :D
|
2011-03-19 15:49:36 +01:00 |
|
jacksonmj
|
993fb876c9
|
Fix stickmen photons and neutrons
|
2011-03-19 12:00:53 +00:00 |
|
Lieuwe
|
6c000478f2
|
changed zip filename
|
2011-03-18 23:10:38 +01:00 |
|
jacksonmj
|
f316b1fdb9
|
Remove redundant rotate/invert code and correct rotation direction
|
2011-03-18 20:14:19 +00: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 |
|
Lieuwe
|
9c39875ef0
|
...
|
2011-03-18 17:04:51 +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 |
|
Cracker64
|
6ef9f0300e
|
check bounds for wind, causes some funny glitches though.
|
2011-03-18 00:35:09 +00:00 |
|
jacksonmj
|
1802c160c4
|
Remove code to delete SPAWN when stickman produced
Code doesn't actually do anything in official source, due to operator
precedence and lack of brackets.
|
2011-03-18 00:26:12 +00:00 |
|
jacksonmj
|
b2252ce9b2
|
Fix incorrect pitch in sdl_seticon
Was causing garbled icon on linux. 16 pixels * 4 bytes per pixel = 64, not 128.
|
2011-03-17 22:08:36 +00:00 |
|
jacksonmj
|
3b3a173dc9
|
Remove neutrons from pmap
|
2011-03-17 21:42:07 +00:00 |
|
Lieuwe
|
bc8af4e210
|
fuck the wrong branch. also, particle delete function.
|
2011-03-17 18:59:42 +01:00 |
|
Lieuwe
|
295b384466
|
fixed keyrepeat api call
|
2011-03-17 16:35:00 +01:00 |
|
Cracker64
|
15deb1145b
|
PRTO fix
|
2011-03-16 20:49:33 +00:00 |
|
jacksonmj
|
a6dabf2072
|
Visual Studio
|
2011-03-16 19:09:12 +00:00 |
|
Cracker64
|
ffc3e0a5ee
|
PRTO fix
|
2011-03-16 14:58:58 -04:00 |
|
Lieuwe
|
b4a3b12d3d
|
broke stuff
|
2011-03-16 16:53:20 +01:00 |
|
jacksonmj
|
0208410952
|
flood_parts uninitialised variable
|
2011-03-16 11:39:31 +00:00 |
|
Lieuwe
|
a7408b93c0
|
nother bugfix
|
2011-03-15 21:05:19 +01:00 |
|
Lieuwe
|
5066ecab0c
|
small bugfix
|
2011-03-15 20:59:37 +01:00 |
|
Lieuwe
|
f7bd1198b1
|
MERGE
|
2011-03-15 20:48:23 +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
|
3b7cf24757
|
Display element contained by PIPE in debug mode
|
2011-03-15 15:57:12 +00:00 |
|
jacksonmj
|
db91bd37f0
|
Display photon wavelengths in HUD
|
2011-03-15 15:47:09 +00:00 |
|
Lieuwe
|
c073c73c56
|
another 64bit fix
|
2011-03-14 22:17:26 +01:00 |
|
Lieuwe
|
67b68e32ff
|
this might fix the python console on 64bit without #define PYEXT
|
2011-03-14 21:37:02 +01: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 |
|
jacksonmj
|
72a4490bb5
|
Save ID is useful, so display it!
|
2011-03-12 18:12:29 +00:00 |
|
jacksonmj
|
24e053ca62
|
Limit length of save title and username at bottom of screen
|
2011-03-12 17:08:35 +00:00 |
|
jacksonmj
|
0a3b44ee14
|
Update fancy mode to use the new GLOW graphics
|
2011-03-12 14:01:58 +00:00 |
|
Cracker64
|
a3cc010aae
|
forgot some files, and a few fixes, set commands use 'setfrom' instead of 'from' as a keyword, wind brush fixes.
|
2011-03-11 20:58:43 -05:00 |
|
jacksonmj
|
fbae5fb16a
|
Flashing BRAY fix
We should just be thankful that negative life will not save correctly...
|
2011-03-10 23:50:20 +00:00 |
|
Cracker64
|
3b048f8a06
|
merge merge merge
|
2011-03-10 15:43:27 -05:00 |
|
Simon
|
2339084d15
|
Remove some redundant code
|
2011-03-10 18:30:28 +00:00 |
|
Simon
|
4942cc14b0
|
Testing commit
|
2011-03-10 18:19:31 +00:00 |
|
Simon
|
9699477e9e
|
Alter year, useless commit
|
2011-03-10 17:58:27 +00:00 |
|
Simon
|
0ded22493e
|
Fix makefile for OS X
|
2011-03-09 18:01:53 +00:00 |
|
Lieuwe
|
db07c1ee0c
|
added #define to disable PYCONSOLE
|
2011-03-09 15:41:50 +01:00 |
|
Cracker64
|
ca1cd0da06
|
check bounds for wind, causes some funny glitches though.
|
2011-03-07 00:32:04 -05: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 |
|
Simon
|
30462ec28d
|
Python console changes
|
2011-03-04 11:14:34 +00:00 |
|
Lieuwe
|
04f4a0d9fe
|
Merge branches 'pyconsole_internal' and 'master' into pyconsole_internal
|
2011-03-03 21:18:14 +01:00 |
|
Lieuwe
|
0a9ea3819f
|
Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy
|
2011-03-03 21:14:28 +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 |
|
Lieuwe
|
9f8811159c
|
pulled some code by cracker which makes output even more awesome :P
|
2011-03-03 19:38:06 +01:00 |
|
Cracker64
|
9e8b7440ba
|
a get_pmap and get_prop function for python so fancier scripts can be made. Made a demo of increasing element type by one, import example, example.increment()
|
2011-03-02 23:30:04 -05:00 |
|
Simon
|
920e589d62
|
Enable key repeat for console
|
2011-03-02 22:22:46 +00:00 |
|
Cracker64
|
57d24f3ffa
|
update readme for console
|
2011-03-02 16:00:49 -05:00 |
|
Lieuwe
|
364759ff08
|
python console
|
2011-03-03 04:54:19 +08:00 |
|
Cracker64
|
9fffbb88da
|
console things, set commands use keywords for arguments.
|
2011-03-02 15:43:20 -05:00 |
|
jacksonmj
|
647ff2bff0
|
Fix some potential crashes, better handling of empty server responses
|
2011-03-03 04:07:12 +08:00 |
|
jacksonmj
|
e055eb5893
|
Fix ETRD not conducting correctly to adjacent particles
|
2011-03-03 04:07:12 +08:00 |
|
Cracker64
|
20edfacae5
|
fix "water spark bounce"
|
2011-03-03 04:05:51 +08:00 |
|
Cracker64
|
4f4796b469
|
INST works with caps lock/replace mode, and fix some replace mode out of screen crashes.
|
2011-03-03 04:05:51 +08:00 |
|
Cracker64
|
13e90886c1
|
fix "water spark bounce"
|
2011-03-01 13:33:10 -05:00 |
|
Cracker64
|
30ceffa46d
|
INST works with caps lock/replace mode, and fix some replace mode out of screen crashes.
|
2011-02-28 19:48:53 -05:00 |
|
jacksonmj
|
57630e561d
|
Fix some potential crashes, better handling of empty server responses
|
2011-02-26 20:58:22 +00: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 |
|
jacksonmj
|
a972644c4f
|
Fix ETRD not conducting correctly to adjacent particles
|
2011-02-24 19:24:37 +00:00 |
|
Simon
|
669a672b3d
|
Pretty transparent console
|
2011-02-24 18:04:08 +00:00 |
|
Simon
|
fd6f6c5406
|
WIND from cracker!
|
2011-02-24 17:11:05 +00:00 |
|
Cracker64
|
83d89ad4cd
|
rename drag to wind
|
2011-02-24 00:52:37 -05:00 |
|
Cracker64
|
bf24a26139
|
forgot powder.h, and renamed drag to wind
|
2011-02-24 00:51:09 -05:00 |
|
Cracker64
|
98a61e0e20
|
a drag tool!
|
2011-02-24 00:26:37 -05:00 |
|
Cracker64
|
a53d956d8d
|
transparent console....
|
2011-02-23 21:55:33 -05:00 |
|
Cracker64
|
879dd43e31
|
Fix GoL to not set gol2 on other things
|
2011-02-24 09:16:17 +08:00 |
|
jacksonmj
|
3011367eb0
|
Fix particles displaced by liquids moving to overlapping positions
|
2011-02-24 09:15:39 +08:00 |
|
jacksonmj
|
a64c202834
|
Fix lava freezing point
|
2011-02-24 09:15:39 +08:00 |
|
jacksonmj
|
71a6654c03
|
Fix particles displaced by liquids moving to overlapping positions
|
2011-02-24 00:57:13 +00:00 |
|
jacksonmj
|
7ecaa16362
|
Fix lava freezing point
|
2011-02-23 21:15:54 +00:00 |
|
Simon
|
1b9b1752a7
|
Switch life to ctype for, photons apparently use the GLOW ctype for something
|
2011-02-23 20:54:11 +00:00 |
|
Simon
|
5d4d815ad3
|
Fancier glow, now affected by Velocity, Pressure and Heat
|
2011-02-23 20:35:02 +00:00 |
|
Cracker64
|
cf80586ddc
|
Fix GoL to not set gol2 on other things
|
2011-02-23 13:33:36 -05:00 |
|
Simon
|
0028dc8431
|
Increase debug coords string buffer to prevent crashes
|
2011-02-23 17:15:25 +00:00 |
|
Cracker64
|
9b3c25227a
|
Reduce GoL lag
|
2011-02-24 01:04:43 +08:00 |
|