matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,569 Commits 13 Branches 426 Tags 113 MiB
f508013332
Commit Graph

1157 Commits

Author SHA1 Message Date
Simon Robertshaw
289f4e4e4e Change console info 2011-06-02 20:16:43 +01:00
Simon Robertshaw
a7330b9b26 tpt.set_property implementation 2011-06-02 18:49:31 +01:00
Simon Robertshaw
c003fee63e Ambient heat (disabled by default) 2011-06-01 20:18:19 +01:00
Simon Robertshaw
3d600c6955 Add gravity field manipulation to Lua api, move gravity processing to after the particle update (Means a delay of 1 frame, but we get the ability to manipulate the field with Lua) 2011-06-01 12:16:33 +01:00
Simon Robertshaw
2c8c4bc567 Pass mouse coordinates (mousex, mousey, mouseb, mousebq) and Lua click handling 2011-05-31 18:38:13 +01:00
Simon Robertshaw
2327d9678d implement create and delete functions 2011-05-31 17:07:38 +01:00
Simon Robertshaw
03a048afe5 Add calm blue text colour, buffer overflow fix for richtext 2011-05-31 00:33:47 +01:00
Simon Robertshaw
7a875dd846 Fix buffer overflow with huge error message 2011-05-31 00:05:01 +01:00
Simon Robertshaw
b0659e3dd1 Step code registration, just an example at the moment 2011-05-30 20:11:34 +01:00
Simon Robertshaw
d5f1a4cfd0 Many methods for Lua console 2011-05-30 19:44:17 +01:00
Simon Robertshaw
cad644824d Defaults for tpt.drawtext method 2011-05-30 18:25:02 +01:00
Simon Robertshaw
d8051926c8 More descriptive error messages for lua console 2011-05-30 18:15:56 +01:00
Simon Robertshaw
65252aa002 drawtext for Lua 2011-05-30 16:45:39 +01:00
Simon Robertshaw
79a27c2c90 Basics for Lua 2011-05-30 16:22:39 +01:00
Simon Robertshaw
5dcc3dbb44 Rich text syntax 
TODO: Link hovering
 2011-05-29 17:00:31 +01:00
Simon Robertshaw
e35440fe59 MOTD on search page 2011-05-29 14:30:22 +01:00
jacksonmj
4fd97b93b4 Large speed improvement for QRTZ 
Also prevent growing when sparked.
 2011-05-29 13:38:53 +01:00
jacksonmj
7750cf8ccd Improve decoration in blob view, exclude from life and heat view 2011-05-29 13:38:39 +01:00
jacksonmj
f603e33e74 Small speed improvement to eval_move 
Warning: may be buggy, test thoroughly.
 2011-05-29 13:36:11 +01:00
jacksonmj
5e414e64dc Fix WIND decoration, and reset dcolour in create_part 2011-05-29 13:35:00 +01:00
jacksonmj
a2c171fbf9 Remove remaining references to old decorations buffer 2011-05-29 13:34:50 +01:00
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
a40d1dc121 Decorations saving 2011-05-28 20:37:26 +01:00
Simon Robertshaw
577ad4eb47 Gravity state now saved 2011-05-28 18:54:12 +01:00
Simon Robertshaw
232595c209 Fix image decompression 2011-05-28 18:15:05 +01:00
Simon Robertshaw
2795970639 Some debug info for image decoding 2011-05-28 18:05:05 +01:00
Simon Robertshaw
4c4b457cab Full thumbnails for open_ui 2011-05-28 17:16:12 +01:00
Simon Robertshaw
95e51bc7f4 Render uses resample_img 2011-05-28 15:29:33 +01:00
Simon Robertshaw
edc6339369 Render changes 2011-05-28 14:57:07 +01:00
Simon Robertshaw
380a45a4c9 Image resampling for thumbnails 2011-05-28 14:19:01 +01:00
Simon Robertshaw
abb0ceb981 Use PTi for thumbnails in game browser 
TODO: Better scaling/resampling
 2011-05-28 13:54:23 +01:00
Simon Robertshaw
2c7b8a6902 Fix renderer, add image decode/code methods 2011-05-28 13:49:07 +01:00
jacksonmj
ab7cd2e5f6 Skip some calls to do_move for liquids 
No liquid can occupy the same space as itself unless in E-Hole
 2011-05-28 18:51:57 +08:00
jacksonmj
420f8e7442 Make NBHL/NWHL eat things in the same way as BHOL/WHOL 
Also make ANAR move opposite to Newtonian gravity
 2011-05-28 18:51:57 +08:00
jacksonmj
6e9cbfdb4a Fix STKM always going through walls 
Now behaves as normal, i.e. only occasionally goes through walls.

Walls which completely block all particles are in the pmap with type
0xFF. ptypes[] doesn't go up to 0xFF, so ptypes[0xFF].state will not
necessarily result in an answer that gives correct behaviour for walls.
 2011-05-28 18:51:57 +08: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
7bf0ac10f6 Add some potential HTTP response codes 2011-05-24 19:57:08 +01:00
Simon Robertshaw
2a1e51abff temp fix for linux compilation 2011-05-24 15:11:25 +01:00
Simon Robertshaw
a52344f399 Decorations improvements 2011-05-24 15:01:18 +01:00
Simon Robertshaw
2d9e0b75e4 jacksonmj's decorations commit 2011-05-24 14:57:46 +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
ee39c06152 Decorations toggle and brush size keys 2011-05-24 21:49:08 +08:00
jacksonmj
fc4de9640c Fix sim options description, GOO and DEUT 2011-05-24 21:49:08 +08:00
Simon Robertshaw
dadac37264 Move Diamond into solids menu, add gravity elements 2011-05-20 13:00:34 +01:00
Simon Robertshaw
c932552aed Message notifications on login 2011-05-20 12:42:36 +01:00
Simon Robertshaw
1622974c0a Fix message notifications for non-elevated users 2011-05-19 21:41:13 +01:00
jacksonmj
603844f97f Fix DEUT explosion 2011-05-19 22:53:24 +08:00
jacksonmj
7482e4d071 Small fix for liquid and powder movement 2011-05-19 22:53:23 +08:00
jacksonmj
68c4d6d621 Make sure WIND can't be created 
Revert this if the element number is reused for something useful
 2011-05-19 22:53:23 +08:00
jacksonmj
e4b03fb2e2 Photons and neutrons go through portal instead of reflecting 2011-05-19 22:53:23 +08:00
Simon Robertshaw
af68469f6a pthread Win32 static linking 2011-05-19 15:32:50 +01:00
Simon Robertshaw
3ff800ec9a Message notification changes 2011-05-19 08:08:59 +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
d8e7c82f1c Fix n-gravity toggle 2011-05-15 19:45:45 +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
e675fb3cc1 Fix crash with negative lava ctype 
E.g. "set type prti lava"
 2011-05-14 13:44:44 +01:00
jacksonmj
203c3a0151 Translate invisible particles to decorated diamond when loading 2011-05-14 13:44:22 +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
jacksonmj
882a839205 Fix high speed photons when reflecting near glass 2011-05-14 13:39:14 +01:00
Simon Robertshaw
fa54c005b2 Use properties for life decrement/kill 2011-05-14 13:38:52 +01:00
Simon Robertshaw
73f2f9f57f fix neutron cloning 2011-05-14 13:34:06 +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
d0f236d6b9 Condition variable instead of busy wait 2011-05-14 13:21:44 +01:00
Simon Robertshaw
33eb485c9f Revert "-a" 
This reverts commit 550d270af2.
 2011-05-14 13:09:46 +01:00
Simon Robertshaw
550d270af2 -a 2011-05-14 13:02:36 +01:00
Simon Robertshaw
3196690b03 Runtime scale switching 2011-05-13 10:44:39 +01:00
Simon Robertshaw
351565c6e2 Fix some thread sync and gravity sync issues 2011-05-12 18:45:14 +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
jacksonmj
b5a334c2af Improve piling of powders 2011-05-05 20:36:14 +01:00
jacksonmj
59d9071e87 Make damp sponge much less flammable 
Also make evaporation cool the sponge better
 2011-05-05 20:35:17 +01:00
jacksonmj
0aa4970b33 Remove some unnecessary checks 2011-05-05 20:35:08 +01:00
jacksonmj
892a2b11c7 Make middle click work with photon map 2011-05-05 20:34:22 +01:00
jacksonmj
9a3836879e H2 burns from spark, lava, plasma; O2 burns from plasma 2011-05-05 20:34:05 +01:00
jacksonmj
a7b5718c6a Fixes for previous commit 
Previous commit caused buggy movement in walls
 2011-05-05 20:33:42 +01:00
jacksonmj
ddaed2ad69 Slight speed improvement for liquids and powders 2011-05-05 20:33:09 +01:00
jacksonmj
7543a3d05e Fix plut lava 
type already set to ctype and ctype already cleared, whoops.
 2011-05-05 20:31:46 +01:00
savask
f0c5960b56 Some work on bubbles. Added "bubble x,y" command to console. 
Also made them save like regular soap.
 2011-05-05 20:24:42 +01:00
savask
3ea306cc77 Some changes to soap. 2011-05-05 20:24:21 +01:00
Simon Robertshaw
5aefd0cb01 Initial soap commit 2011-05-05 20:14:35 +01:00
Simon Robertshaw
fb408ab82b Revert "Dem bubbles" 
This reverts commit 607572cf0d.
 2011-05-05 20:08:13 +01:00
unknown
607572cf0d Dem bubbles 2011-05-05 19:58:30 +01:00
Simon Robertshaw
981e17927b Fix BMTL and gravity breaking 2011-04-26 16:57:04 +01:00
Simon Robertshaw
06c0949beb Gravity breaks elements like pressure does (Doesn't work for broken metal and needs tweaking a little) 2011-04-26 16:46:57 +01:00
Simon Robertshaw
75d5cc3d04 Fix for non-diff mode 2011-04-26 16:18:43 +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
4c153d2f34 gravmutex = NULL not liked by some compilers (It's not actually correct anyway) 2011-04-25 16:59:04 +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
aef09292ee Allow negative gravity 2011-04-24 20:18:00 +01:00
Cracker64
3a541dfcbb visual studio fixes 2011-04-24 20:04:16 +01:00
Cracker64
0ccd04b848 More decoration improvements. still TODO: text boxes that will change current color, as well as display current color. A menu with some basic color swatches. 2011-04-24 20:04:05 +01:00
Cracker64
88995a5910 line/box tool for decorations, some other things. 2011-04-24 20:04:01 +01:00
Simon Robertshaw
3acf9aae2a Asynchronous thread for gravity processing 2011-04-24 17:49:33 +01:00
Simon Robertshaw
db427e4cdd Dear PSTE 
Nobody likes you
Sincerely, Everyone
 2011-04-23 21:20:32 +01:00
Cracker64
085ea571b8 fix in RGB_to_HSV. 2011-04-23 14:01:03 +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
jacksonmj
aa3f475edc Stricter frame rate limiting 2011-04-23 07:52:59 +08:00
jacksonmj
3e1ff2094c Fix WTRV formed from burning firework dust 2011-04-23 07:52:59 +08:00
jacksonmj
3bfa39ecf3 Fix crash when setting fan direction with caps lock on 2011-04-23 07:52:59 +08:00
jacksonmj
f3b341c7b2 Remove limit on size of console scripts 
Also fix regex to work with x,y instead of needing x+0,y+0
 2011-04-23 07:52:59 +08:00
jacksonmj
9fb965f59d Restrict temperature in DEUT explosion 2011-04-23 07:52:58 +08:00
Simon Robertshaw
13ff21bb22 Gravitaaaay (Needs tweeking for performance) 2011-04-22 17:06:09 +01:00
Simon Robertshaw
31d76df948 Fix returns for Coal code 2011-04-21 14:15:15 +01:00
Cate
635be04c16 Added the same IF to COAL for consistency, seems to work. Changed Ctypes to PT_Names instead of equivilent numbers. 2011-04-19 18:10:03 +01:00
Simon
743b7dffce bcol Catelite merge 2011-04-19 18:09:36 +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
jacksonmj
8d8cc909bb Ensure invisible photons get killed 2011-04-16 17:27:25 +01:00
jacksonmj
96d2587f29 Make high life lcry, pcln, pump, hswc graphics more boring 2011-04-16 17:27:03 +01:00
jacksonmj
1c771d1ea4 Photons and neutrons through portal 2011-04-16 17:26:54 +01:00
jacksonmj
466a6b2ccb Whoops, missing header for exe_name 2011-04-16 17:26:29 +01:00
jacksonmj
24808344f4 Fix some memory leaks in save build/parse 2011-04-16 17:26:18 +01:00
jacksonmj
d6a28b6427 Use malloc in transform_save 
Should fix crashes on Windows caused by stack overflow
 2011-04-16 17:26:07 +01:00
Simon
605c957955 <.< >.> Nobody saw that... 2011-04-13 21:39:46 +01:00
Simon
f20bedd3de info_box for renderer 2011-04-12 12:51:43 +01:00
Simon
664b578d13 Fix segfault with renderer 2011-04-12 12:39:28 +01:00
Simon
67531c2434 Game save renderer 2011-04-12 12:19:21 +01:00
Simon
7be136ddee Distilled water instead of water from H2+O2 2011-04-10 11:47:49 +01:00
Simon
422fcc68ec Better Oxygen/Hydrogen burning 2011-04-10 11:38:29 +01:00
Simon
9216675f41 And that's the last of the warnings 2011-04-08 15:44:13 +01:00
Simon
6c3ac2af5c Remove more warnings 2011-04-08 15:39:55 +01:00
Simon
626cc8fa6a Remove a TON of warnings 2011-04-08 15:28:57 +01:00
Simon
60039b531e Bizarre solid uses Bizarre colour system 2011-04-08 15:13:19 +01:00
Simon
92b2cb70bd Revert "Portal orbital effects stop more smoothly" 
This reverts commit 29e41a0a0c.
 2011-04-08 14:33:13 +01:00
Simon
f8f8b71869 Re-add install hotkey, removed in astyle commit 2011-04-08 13:10:35 +01:00
jacksonmj
c36c90e800 Workaround for some argument parsing bugginess 2011-04-08 11:11:48 +01:00
jacksonmj
40c4dde34a Document icons for linux 2011-04-08 11:11:30 +01:00
jacksonmj
6ac508a5de Start register_extension support for linux 
Also fix a limitation on the length of open: paths
 2011-04-08 11:11:20 +01:00
jacksonmj
75f6ea610a More sensible types for path lengths 
Now uses the types given in the path function declarations
 2011-04-08 11:11:03 +01:00
jacksonmj
4aeac8b316 Also register .stm extension in Windows 2011-04-08 11:10:52 +01:00
jacksonmj
29e41a0a0c Portal orbital effects stop more smoothly 
When fe==0, dots finish moving to destinations before disappearing
 2011-04-08 11:10:41 +01:00
jacksonmj
63f3f90c55 Improve PRTI orbital effects 
Prevent ugly positioning of orbital effects when PRTI is surrounded but still taking in particles
 2011-04-08 11:10:28 +01:00
jacksonmj
cbbce662cc Electrolysis produces H2 2011-04-08 11:10:16 +01:00
jacksonmj
30f2b3217c More accurate H2O ratio when forming water 2011-04-08 11:10:01 +01:00
Simon
767d73c5fc astyle 2011-04-08 11:09:42 +01:00
jacksonmj
1bdf72be1a Some fixes for H2 2011-04-08 11:06:50 +01:00
Simon
a2edfa11b8 Installer 2011-04-06 13:48:41 +01:00
Simon
5e03aae7b3 Register extension 2011-04-06 13:37:28 +01:00
Simon
ca02640ebb Avoid potential overflow when pasting long text strings 2011-04-06 13:14:13 +01:00
Cracker64
1bc97fcc37 copy and paste functions for text boxes. 2011-04-06 13:08:59 +01:00
Simon
7663192174 Copy text box for save_name_ui 2011-04-04 20:46:27 +01:00
Simon
af76611a64 Add copytext box to the footer of open_ui 2011-04-04 20:27:00 +01:00
Simon
8872a1065b Move copybox into its own control 2011-04-04 20:02:11 +01:00
Simon
078db03a52 NULL Window handle for OpenClipboard 2011-04-04 17:22:17 +01:00
Simon
5c079443f9 clipboard_push_text implementation for WIN32, UNTESTED 2011-04-04 17:07:38 +01:00
Simon
922befd844 Fix O2 and H2 files, also fix zero life death 2011-04-04 16:40:22 +01:00
Simon
2f91bdb9bc Register extension now sets the correct icon 2011-04-04 16:28:43 +01:00
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
Cracker64
bdcc6e3fba Reduce GoL lag 2011-02-22 20:55:50 -05:00
Cracker64
a8439f221e updating 2011-02-22 20:55:09 -05:00
Simon
417b740d46 Make the help screen a bit cleaner 2011-02-22 17:51:51 +00:00
jacksonmj
c9725c6004 Merge branch 'upstream' into dev 
Conflicts:
	src/main.c
 2011-02-22 15:18:04 +00:00
Simon
a84234dcd4 Improvement to scrolling menu 2011-02-22 00:51:01 +00:00
Simon
bb0b4e6802 UI improvements for elements menu 2011-02-21 17:57:17 +00:00
Simon
383eaff5b2 Sound and scripts are opt-in, to speed up loading and closing 2011-02-21 16:24:03 +00:00
Simon
064579c9e4 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-02-21 16:10:05 +00:00
jacksonmj
6f2965d0d0 Zoom key conflict with international keyboards 
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
 2011-02-22 00:08:20 +08:00
jacksonmj
1419337374 Reduce overlap of HUD text when in debug/beta mode 
Also reduce duplication of some HUD code
 2011-02-22 00:08:20 +08:00
jacksonmj
dc35feeac9 Fix console preventing window from closing 2011-02-22 00:05:52 +08:00
jacksonmj
ac7eda80a5 Zoom key conflict with international keyboards 
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
 2011-02-20 22:47:08 +00:00
jacksonmj
317ddab617 Reduce overlap of HUD text when in debug/beta mode 
Also reduce duplication of some HUD code
 2011-02-20 20:55:47 +00:00
jacksonmj
b3278cf888 Fix some compiler warnings 2011-02-20 20:46:26 +00:00
jacksonmj
1ae599d63e Fix console preventing window from closing 2011-02-20 19:08:50 +00:00
Simon
9002a87d61 Notication of authentication improvement 2011-02-19 19:28:39 +00:00
Simon
1307af5c57 Fix saving of display mode from keys and fix persistent display 2011-02-19 18:59:07 +00:00
jacksonmj
e640e2dd42 Always save last display mode 2011-02-19 15:51:10 +00:00
jacksonmj
a2091ede76 Move reset code to own function 
Also clear persistent view when loading a save or clearing the screen.
 2011-02-19 15:41:44 +00:00
jacksonmj
72e6fdd9f6 Preventing creation of invalid types also prevented use of air/temp tools 2011-02-19 07:07:08 +08:00
jacksonmj
df8c13cc58 create_box improvements 
Boxes now have sharp corners - they fill only the specified rectangle and not 1 pixel extra
on all sides.
 2011-02-19 07:06:22 +08:00
jacksonmj
81ce5d74cc Crash when element with invalid type is created 
Generally due to an invalid ctype for clone.
 2011-02-19 07:06:22 +08:00
jacksonmj
1b23302513 FLAG_STAGNANT usage lost during rewrite 2011-02-19 07:06:21 +08:00
jacksonmj
dab9f85024 Fix incorrect liquids movement 2011-02-19 07:06:21 +08:00
Cracker64
7c123cdb00 NEUT fixed to dust and fwrk reaction. 2011-02-19 07:04:54 +08:00
Cracker64
89b19bcbee NEUT fixed to dust and fwrk reaction. 2011-02-17 19:03:14 -05:00
Cracker64
b08c37342b Commands in signs, some don't fit 2011-02-14 20:32:01 -05:00
Simon
809289b13d ALL GLORY TO THE SAVASK 2011-02-13 14:38:42 +00:00
Simon
e6ab5b0f36 Fix Clickable signs 2011-02-13 14:03:06 +00:00
Simon
b0b736d49e Moved Gravity identifiers, added gravity mode and air mode to save format 2011-02-13 13:42:38 +00:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility 
Also fix two compiler warnings
 2011-02-13 00:30:54 +00:00
Cracker64
e882dfecf9 update with latest 2011-02-10 19:46:34 -05:00
jacksonmj
457ceeff0a BCLN and GOO advection fix 2011-02-09 17:19:48 +00:00
Simon
3de4d163a5 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-02-09 15:56:30 +00:00
Cate
d5fe05d760 "Added Air modes using Gravitymode code" 2011-02-09 23:52:28 +08:00
jacksonmj
7c100f29c0 gol2 not resetting properly 
Causes life to malfunction severely in some cases
 2011-02-08 22:32:06 +00:00
jacksonmj
6bbc5328fc Sound device not compulsory 2011-02-08 14:30:02 +00:00
jacksonmj
b85c29dee4 Prevent crashes in the event of ridiculous temperatures 2011-02-07 20:29:11 +00:00
jacksonmj
cb74b0bacf Improve console element parsing 
GOL, 34, 2x2 now work. Element types can no longer be referred to by
number, to remove ambiguity between type and particle number.
 2011-02-07 17:13:31 +00:00
jacksonmj
29bd6e42f5 Correct some fancy mode graphics 2011-02-07 16:19:14 +00:00
jacksonmj
5fbb37ba60 Fix console particle number, coordinate parsing 2011-02-07 15:56:10 +00:00
jacksonmj
ee100cb4f0 Fix GoL deleting particle 0 2011-02-07 15:24:08 +00:00
jacksonmj
6749eb1960 More flood_parts fixes 
kill_part needs to update photon map, otherwise delete_part keeps
deleting the same photon, leading to infinite flood_parts recursion.
 2011-02-06 20:24:20 +00:00
Cracker64
30d86813fc hidden menu shows up correctly 2011-02-06 13:29:37 -05:00
jacksonmj
e791e21c3e Fix x,y not always updating and particle # not showing when BETA defined 2011-02-06 17:52:35 +00:00
Cracker64
9844636593 particle # shows up again 2011-02-06 12:50:04 -05:00
jacksonmj
b7e50f521c Fix flood_parts crashes 
Crashes due to infinite recursion in flood_parts, which seemed to be caused by
the pmap being incorrect.
 2011-02-06 17:16:49 +00:00
FacialTurd
3a4b7f6983 Uninitialised pointer segfault if not previously logged in - jacksonmj 2011-02-06 04:41:48 -08:00
jacksonmj
21d0dd0ca2 Better text wrapping 2011-02-05 15:44:29 +00:00
jacksonmj
196ccd1e36 Uninitialised pointer segfault if not previously logged in 2011-02-04 20:53:15 +00:00
jacksonmj
2569d244d4 Merge branch 'upstream' into dev 
Conflicts:
	src/powder.c
 2011-02-04 19:59:50 +00:00
Simon
0d863dce94 Nobody likes extra line breaks] 2011-02-04 12:17:24 +00:00
Simon
aef66fbfe3 Session checking on startup and compatibility fixes 2011-02-04 12:16:45 +00:00
Simon
dd5ca12223 We don't want any buffer overflow, especially when reading file and user input 2011-02-04 11:42:11 +00:00
Simon
9469a3b46a Merge with cracker, also fix version 2011-02-04 10:24:35 +00:00
Cracker64
9064cabf28 merge jacksonmj's and much better string parsing because of a function i found. 2011-02-04 01:00:03 -05:00
Cracker64
1755f08e44 variables and if statements for scripts, GoL is glitchy for me, i don't know why 2011-02-03 16:38:58 -05:00
jacksonmj
d21d1f7ba5 Merge branch 'upstream' into dev 2011-02-03 18:47:23 +00:00
Simon
525a59e280 Fixes from cracker64, also lolsounds 2011-02-03 15:37:55 +00:00
jacksonmj
54caad7a69 Possible fix for liquids transferring spark through INSL 2011-02-03 12:04:11 +00:00
jacksonmj
8aaaae1daf Make PTCT/NTCT cool down even when covered with spark 
Also fix typo in update_PHOT
 2011-02-03 00:08:56 +00:00
jacksonmj
5b1210714d More fixes 
Fix PHOT and FWRK.
Fix QRTZ conductivity (broken by removing PROP_CONDUCTS)
Add some things lost during rewrite: NTCT/PTCT not heated if INSL in the way;
boiling point varies with pressure.
 2011-02-02 17:49:56 +00:00
Cracker64
db038e9643 HERE are the doubled memsets 2011-02-02 00:18:22 -05:00
Cracker64
2fb7c944cd fix a few things, some memsets were doubled. 2011-02-02 00:15:57 -05:00
Cracker64
5383311cba testing playing .wav files. lol sounds 2011-02-01 20:35:41 -05:00
jacksonmj
77bcac1a56 Small fixes 
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
 2011-02-01 16:06:48 +00:00
Cracker64
c558df240b made set work with all of one type of a particle (set type dust deut) turns all dust into deut 2011-01-31 23:30:53 -05:00
Cracker64
fea297b2ac Update with simon, and drawing SPRK on walls crash fix. 2011-01-31 22:53:32 -05:00
Simon
c78d4203ee Small changes from cracker 2011-01-31 22:17:44 +00:00
Simon
b033a9655d Fix for liquids - jacksonmj 2011-01-31 22:10:34 +00:00
jacksonmj
d52fa30a45 Attempt fix for liquids 2011-01-31 22:00:12 +00:00
Simon
5ec884993f Fix login for non-elevated users 2011-01-31 20:25:27 +00:00
Cracker64
c1ca8bae29 merge jacksonmj's and simon's changes, and made mouse coords show up in debug so it is easier to get them. 2011-01-31 13:12:29 -05:00
Simon
8363a21f23 ALL GLORY TO THE SAVASK 2011-01-31 16:54:13 +00:00
jacksonmj
5bf8755655 Console improvements 
Can use x,y coordinates to specify which particle.
ctype now also accepts element names.
More sanity checking of input.
delete command added.
 2011-01-31 16:36:40 +00:00
jacksonmj
363a3e38f1 Merge branch 'cracker64' into dev 
Conflicts:
	src/interface.c
	src/main.c
 2011-01-31 14:05:05 +00:00
Cracker64
3babc0586c stupid git, didn't take description change 2011-01-31 00:49:50 -05:00
Cracker64
b7f768e4b3 Moved console commands into own function. Added running script files so console commands can be run instantly. Added create command. element names work, from jacksonmj. 2011-01-31 00:12:47 -05:00
jacksonmj
cdd7399cc1 Make console recognise element names 2011-01-31 02:42:34 +00:00
jacksonmj
f85ef31b1f Merge branch 'upstream' into dev 2011-01-31 02:25:55 +00:00
Simon
61292f5355 Fix bugs with console. 2011-01-30 23:20:12 +00:00
Cracker64
6aaa9e78cd possible fix from jacksonmj, cursor gets set to end while changing commands with up/down 2011-01-30 18:15:53 -05:00
jacksonmj
e2b916a91f Console segfault fix 
ed.str is deallocated when console_ui returns. Dereferencing the
returned pointer to ed.str therefore results in bad things.
 2011-01-30 22:37:59 +00:00
jacksonmj
f97990fedd Merge branch 'upstream' into dev 2011-01-30 22:36:15 +00:00
Cracker64
8ed2947b4c update with latest 2011-01-30 16:46:50 -05:00
Simon
bcbcb0063b Command buffer, limit is 9, I think 2011-01-30 21:38:24 +00:00
Simon
c6db32f829 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-01-30 20:11:10 +00:00
Simon
8510421b37 Merge with crackers console 2011-01-30 20:05:47 +00:00
Cracker64
fcf958da21 added 'load' command, and a basic error message. 2011-01-30 15:00:54 -05:00
Cracker64
e18337a70a Added a console! it is pretty self explanitory 2011-01-30 01:23:24 -05:00
FacialTurd
d61efca4e5 Missing header for CM_COUNT 2011-01-29 09:42:01 -08:00
Simon
7522e95a9d Missing file, also fix cmode saving 2011-01-29 12:19:48 +00:00
Simon
f391b896d4 Use Sessions instead of saving password 2011-01-29 12:16:13 +00:00
jacksonmj
5d34cae2e4 Consistent use of NGOL, better NSCN description 2011-01-29 11:20:34 +00:00
jacksonmj
9938378c0d Merge remote branch 'cracker64' into dev 
Conflicts:
	includes/element.h
	includes/powder.h
	src/elements/firw.c
	src/elements/legacy.c
	src/elements/phot.c
	src/elements/sprk.c
	src/graphics.c
	src/main.c
	src/powder.c
 2011-01-29 10:50:43 +00:00
Cracker64
4b5337c03a finally fixed visual studio compiling, yay 2011-01-28 21:57:20 -05:00
Cracker64
01304db892 fix some visual studio issues. 2011-01-28 20:53:02 -05:00
Cracker64
964ecf2ecf Other things overwritten, and changes from jacksonmj 2011-01-28 20:13:29 -05:00
Cracker64
880ed33fc7 oops, silly copy file, and fixed the new GoL from simon's fail merging. 2011-01-28 19:58:54 -05:00
Cracker64
bcea95c5ca update to latest 2011-01-28 18:54:50 -05:00
jacksonmj
fe033ce859 INWR should cool after being sparked; and correct function parameters 
Also correct grule size and replicate existing freezing point behaviour for lava
with strange ctypes.
 2011-01-28 23:14:46 +00:00
jacksonmj
a5ff51f5a5 Restore cracker64 changes overwritten by merge 2011-01-28 21:46:40 +00:00
Simon
079d35f1a0 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-01-28 19:56:44 +00:00
jacksonmj
bdfbc7c409 Change include file for element update functions 2011-01-28 19:36:26 +00:00
jacksonmj
2654996599 Fix disappearing WTRV 
If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.
 2011-01-27 22:38:47 +00:00
Simon
e9ae32b0cc Merge with jacksonmj, Warning: potential for lot of bugs 2011-01-27 20:32:34 +00:00
jacksonmj
58a700fbb0 Fix SIGFPE when opening creations with exactly 50 up/down votes 
Only occurs on optimised (using $(OFLAGS) in Makefile) builds
 2011-01-23 15:40:01 +00:00
Cracker64
60d3f0047b quartz shouldn't have prop_conducts, and fixed visual studio compiling 2011-01-20 14:10:34 -05:00
Cracker64
e7f2eb92c5 ctrl-'=' will reset sparks 2011-01-19 17:56:55 -05:00
Cracker64
b25a6ecd59 some photon fixes, and better resets on reload/clear 2011-01-19 16:24:54 -05:00
Cracker64
1b35811bd4 revert all limit changes, a little too glitchy, can be done later when current limit is reached. 2011-01-19 14:25:56 -05:00
Cracker64
ff01973658 made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8. 2011-01-19 13:48:59 -05:00
Cracker64
5c65d69dac missed some bitshifts, which caused a few glitches. Everything seems normal 2011-01-18 00:45:14 -05:00
Cracker64
e1eeaf9e9a test with increased element limit, there seems to be no performace decrease to me anyway. element limit of 4096 2011-01-17 19:11:30 -05:00
Cracker64
926450a9a3 more life types using states, put them in new menu. Maybe get some way to switch to new menu on mouseover of last spot of current life menu 2011-01-16 20:54:41 -05:00
Cracker64
db5bb618c1 fix loading of old GoL saves, and fix wall crash 2011-01-16 13:54:36 -05:00
Cracker64
b1e09d4216 Made GoL code work with more advanced rules with different life states, giving more interesting rules. 2011-01-16 01:29:49 -05:00
jacksonmj
c5670d39c1 Misc small fixes and tidyup 2011-01-15 20:21:22 +00:00
jacksonmj
de58e9a2e7 Fix E-hole 
Was broken for powders by fixing fast moving particles going through obstacles.
For gasses, was broken in upstream.
 2011-01-15 17:01:20 +00:00
jacksonmj
1833be451f Merge branch 'cracker64' into dev 
Conflicts:
	includes/powder.h
	src/graphics.c
	src/main.c
	src/powder.c
 2011-01-15 16:23:51 +00:00
jacksonmj
c7213127e5 Temporarily undo photon reflection fix (causes inaccuracies). 2011-01-15 15:36:42 +00:00
jacksonmj
42d7b56602 Attempt fix for some cases of fast particles going through obstacles 
Also change direction_to_map again, to revert to original version
(which has problems with some diagonal surfaces, but doesn't have noticeable inaccuracies)
for refraction.
 2011-01-15 15:25:39 +00:00
Cracker64
2d79fa5cfe fix photon causing infinite sparks 2011-01-14 21:23:23 -05:00
Cracker64
e33fb40e2d oops, didn't need the floodfill thing there. 2011-01-14 11:05:08 -05:00
Cracker64
b673be0ac2 a fix so photons can be deleted and show up on HUD :) 2011-01-14 00:29:32 -05:00
jacksonmj
0221cdd355 Split elements/misc.c into separate functions 2011-01-13 22:51:55 +00:00
jacksonmj
7fb086065a Correct spelling 2011-01-13 21:56:17 +00:00
jacksonmj
9707443b24 Merge element state into ptypes. 
All of the pstates array except .state was replaced by ptransitions.
 2011-01-13 21:31:24 +00:00
jacksonmj
a23138fbbe Fix permanent stickman death. 2011-01-13 20:17:05 +00:00
jacksonmj
def10c41ae Exaggerate convection, misc rearrangement + fixes 2011-01-13 15:24:01 +00:00
Cracker64
225dab24ea fix some rare SWCH problems 2011-01-12 19:11:46 -05:00
Cracker64
1c8df0f09e fix photon heating particle number 0 2011-01-12 16:36:08 -05:00
Cracker64
6083b64b72 portal was invisible in debug, oops 2011-01-12 13:22:27 -05:00
Cracker64
cc4489ff29 line for portals. wifi channels reset on reload. 2011-01-12 12:15:50 -05:00
jacksonmj
daa6af0cc2 Small fixes and cleanup 2011-01-11 21:17:02 +00:00
Cracker64
c7f1e2e423 fix 1px brush replace mode 2011-01-11 10:45:16 -05:00
jacksonmj
4006bdf4c2 Merge branch 'upstream' into dev 2011-01-11 13:44:52 +00:00
jacksonmj
cf1ef72584 Rearrange some code, make heat transfer run faster 2011-01-10 23:33:58 +00:00
Cracker64
f242566e30 fix QRTZ spot saving, rotate should change FAN vector as well 2011-01-10 09:43:16 -05:00
jacksonmj
54f9f872b9 Finish update function cleanup 2011-01-10 14:41:03 +00:00
jacksonmj
855281295f More update functions cleanup. 2011-01-10 00:46:34 +00:00
Cracker64
d6837437f2 fix c-5 floodfill 2011-01-09 16:16:59 -05:00
jacksonmj
88d107f18a Better channel handling 2011-01-09 21:12:25 +00:00
jacksonmj
6094753eb1 Fix photon reflection (second attempt). 
Previous attempt broke photons in glass.
 2011-01-09 20:42:52 +00:00
jacksonmj
134d8a6874 Prevent cloning PSCN/NSCN by PCLN. 2011-01-09 19:31:34 +00:00
jacksonmj
144e4bdb69 Begin cleanup of update functions 2011-01-09 19:23:05 +00:00
jacksonmj
56a3ad373c Fix photon reflection. 
In cases such as photons travelling horizontally left towards a line
with a shallow slope downwards from left to right.

Direction map now includes directions parallel to photon
velocity in these cases.
 2011-01-09 14:15:09 +00:00
Cracker64
6b06d37ca5 update with simon, and some other changes from jacksonmj. 2011-01-08 21:23:46 -05:00
Cracker64
a6fe456cd0 only add .15 to PUMP, so that things at absolute 0 load at 0. 2011-01-08 18:12:26 -05:00
Cracker64
164681f4e6 GoL speed improvements from jacksonmj (thank you very much) 2011-01-08 17:55:14 -05:00
Simon
75e898e45b Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2011-01-08 21:05:52 +00:00
Simon
764e3966bb Improvements to fancy display 2011-01-08 21:03:43 +00:00
Cracker64
0958a6e6da add ctype transfer to portal 2011-01-08 15:33:54 -05:00
jacksonmj
7f83cb1061 Function pointers + minor adjustments. 2011-01-08 19:39:17 +00:00
Simon
548d052018 New Element from cracker - BOYL 2011-01-08 18:51:22 +00:00
Simon
ad7dc345d2 Fix 2 stickman bug 2011-01-08 18:30:29 +00:00
Cracker64
76304bac8d BOYL, a gas that evens out pressure related to its temp, kind of a gas PUMP, but not really, BOYL+WATR=FOG BOYL+O2=WATR, possibly hydrogen in the future? 2011-01-08 13:16:14 -05:00
Simon
cd08a7102c Changes from cracker 2011-01-08 17:40:30 +00:00
Simon
b83b2f1d27 Convection 2011-01-08 17:38:36 +00:00
jacksonmj
692e2ba86d Revert PCLN switching to original version. 
For compatibility with some saves relying on the exact time
taken for a switch on/off to spread through adjacent PCLN dots.
 2011-01-08 11:17:44 +00:00
jacksonmj
f53826b150 Speed up heat transfer calculations. 2011-01-08 11:00:43 +00:00
jacksonmj
d17758cc08 Yet more function pointers. 2011-01-08 09:00:59 +00:00
jacksonmj
9af0072b21 Further function pointers. 2011-01-07 23:05:26 +00:00
jacksonmj
685ede0643 More electricity rewrite. 2011-01-07 22:20:47 +00:00
jacksonmj
74f6ee8eb5 Oops, fix INWR conductivity. 2011-01-07 20:37:51 +00:00
jacksonmj
6908f3dd0b Tidy up. 2011-01-07 20:26:09 +00:00
jacksonmj
b69712bbdb Some more function pointers 2011-01-07 20:03:58 +00:00
jacksonmj
fa1868314c Shrink GOL wrapping code. GSPEED now works. 2011-01-07 18:15:36 +00:00
Cracker64
52573e94f9 two red BRAYS will toggle SWCH, could be used for something... 2011-01-07 13:07:46 -05:00
jacksonmj
cb02bdfe21 Rewrite electricity code. 2011-01-07 18:00:31 +00:00
jacksonmj
aebcc0ebe4 Use PROP_CONDUCTS more. 2011-01-07 16:56:15 +00:00
jacksonmj
f3ded5f08c More function pointers. 2011-01-07 16:18:22 +00:00
jacksonmj
b661418d7e Replace pstates and some pressure ifs with array. 2011-01-07 14:47:10 +00:00
jacksonmj
1ab4d328a6 Start function pointers 2011-01-07 14:14:35 +00:00
jacksonmj
ed8c0031f4 Astyle. 2011-01-06 22:26:31 +00:00
Simon
6eafb157de Kiosk mode improvements 2011-01-06 08:56:28 +00:00
Simon
2a3af54e92 Kiosk mode, full screen. requested by dante3rd 2011-01-06 08:55:10 +00:00
Cracker64
45078b5933 update, and another small ARAY feature, goes through SWCH. 2011-01-05 18:34:39 -05:00
Simon
a46a484f2e Fix acid drawing and 'purple acid' 2011-01-05 20:36:09 +00:00
Simon
e2d4ae5763 Damn it git, WHAT ARE YOU DOING? 2011-01-05 20:05:40 +00:00
Simon
71c5d53f7f Changes by cracker 2011-01-05 19:42:31 +00:00
Cracker64
cf2489916c some ARAY changes so that more complex things can be made, http://powdertoy.co.uk/Browse/View.html?ID=103300 2011-01-05 14:12:31 -05:00
Simon
5d7c0194f1 INST enabled. INST modifier for ARAY - makes it not stop 2011-01-05 17:42:39 +00:00
Cracker64
fd2f0c905b better liquid movement in radial gravity, '=' resets pressure, cannot draw stickman on clone anymore, 'w' does not work when stickman2 is out, use shift-w. 2011-01-04 20:53:24 -05:00
Simon
0eb4089b08 Easier fancy effects, by Mur 2011-01-04 19:42:50 +00:00
Cracker64
5a37f32ca1 update with simon, and shift-v now does every other frame properly 2011-01-04 13:26:28 -05:00
Simon
43065ba94c Fixes crappiness 2011-01-04 18:05:31 +00:00
Simon
85138b970d Make frame-capture a little more noob-friendly 2011-01-04 18:00:28 +00:00
Simon
3a2bc76643 Gravity control by Moach 2011-01-04 13:35:16 +00:00
Simon
c3eb6e11f9 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2011-01-01 12:43:44 +00:00
Cracker64
5b86cd5c21 QRTZ and powder will have heat glow, also changed heat glow code a bit. 2011-01-01 01:31:25 -05:00
Cracker64
28f1b88ea0 fix INST crash, forgot to change PCLN to work with all GoL. 2011-01-01 01:01:19 -05:00
Simon
6340ff2ac9 Merged new life types from cracker 2010-12-31 11:26:52 +00:00
Cracker64
6519fc167e 7 more gol types, fixed gol code to work with it. 2010-12-31 00:52:40 -05:00
Simon
c98099f8df Small changes to SING from cracker 2010-12-30 22:38:27 +00:00
Cracker64
97e7850de5 oops, was testing 2010-12-30 16:56:11 -05:00