Enno Rehling
|
89bc83c4ab
|
Merge branch 'master' into develop
Conflicts:
src/bind_region.c
src/buildno.h
src/kernel/item.c
|
2015-08-20 16:58:07 +02:00 |
Enno Rehling
|
d69bf18e23
|
suspect some submodule shenanigans
|
2015-08-20 16:26:32 +02:00 |
Enno Rehling
|
7087c0e0ab
|
Update to latest submodules, fix iniparser and critbit.
I did this before, must have lost it in the merge. Crazy.
|
2015-07-12 10:38:01 +02:00 |
Enno Rehling
|
4e33e59d64
|
more lua_pushinteger conversion for lua 5.3
|
2015-06-08 21:19:17 +02:00 |
Enno Rehling
|
2967cd59cf
|
replace pushnumber with pushinteger where applicable (prep for Lua 5.3).
also kill an unreferenced string.
|
2015-06-08 20:53:40 +02:00 |
Enno Rehling
|
da9c33268c
|
fix preview crash in embassies.lua.
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
|
2015-02-01 10:03:30 +01:00 |
Enno Rehling
|
abca25d1d5
|
fix indentation in every file
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
|
2015-01-30 20:37:14 +01:00 |
Enno Rehling
|
4ed469c126
|
do not try setting luxury demand on oceans.
add some old E3 tests, disable those that have rotted.
|
2015-01-01 10:12:03 +01:00 |
Enno Rehling
|
2da1d11277
|
move chaos to a separate module (it is an old E2 feature)
|
2014-12-13 11:44:14 +01:00 |
Enno Rehling
|
920902f8eb
|
replace resource_type::_name array with a single string.
|
2014-08-24 23:58:30 +02:00 |
Enno Rehling
|
d743d32215
|
bind "blocked" flag for Lua (bug 1922).
remove unused region-flags.
|
2014-07-05 10:46:43 -07:00 |
Enno Rehling
|
1a7d892a96
|
use cmake for autoconf, slim down platform.h
|
2014-03-15 19:29:11 +01:00 |
Enno Rehling
|
bf2bb7449b
|
move bindings into src/ make the code compile from scratch again.
|
2014-02-22 00:32:59 -08:00 |