upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 09:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,212 Commits 52 Branches 374 Tags
Commit Graph

59212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Beck
97b654beff add and use zookeeper's start of game sound for mp 
thanks zookeeper!
 2014-11-14 11:56:32 -05:00
Chris Beck
13a873df01 implement image prefs using function pointers, for efficiency 2014-11-14 03:50:51 -05:00
Chris Beck
b309afde7e adjust some of the editor images code for terrain overlays 
the adjustments just make it use the more standard SDL utils fcns
for making a transparent (neutral) surface, and they avoid floating
point operations when scaling images

we also fix a bug caused by using "sdl_blit" instead of
"blit_surface", which caused the terrain overlay not to show up
 2014-11-14 02:43:37 -05:00
Chris Beck
6ad819d759 add a label to lua console describing which kernel is connected 2014-11-14 01:07:12 -05:00
Chris Beck
ca79d3f14a fixup various code comments 2014-11-14 00:50:57 -05:00
Chris Beck
e7a7206402 fixup 22bd42e0c71828243e4df76c761cec5812692733 
This line needs to go in the constructor or similar, the other
version didn't achieve the stated purpose (or cause any actual
run-time difference).
 2014-11-14 00:50:18 -05:00
Chris Beck
48d2e2654f update changelog 2014-11-14 00:34:32 -05:00
Chris Beck
5f96795080 refactor scale_surface, and add old version as "legacy linear" option 2014-11-14 00:32:40 -05:00
Chris Beck
22bd42e0c7 Always build application lua kernel, even if no script loaded 2014-11-13 21:00:36 -05:00
Chris Beck
71ca849bcc travis: disable NLS (translations) on all gcc builds (for speed) 2014-11-13 20:30:47 -05:00
Chris Beck
ff40d28e5a Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-13 20:29:34 -05:00
Chris Beck
59507f3d09 fixup lua error formatting 2014-11-13 20:29:07 -05:00
Chris Beck
51baab8836 try to fix lua console behavior wrt spacing, command history 2014-11-13 20:01:38 -05:00
gfgtdf
a07eec21dd simplify "save_id" generation 
By having one place instead of three where this happens. Also the previous code was bugged becasue it used "saved_id"
 2014-11-14 01:07:28 +01:00
gfgtdf
1c1621bfa1 don't generate "user_description" on the host 
the host it not capable to generate strings in the correct language.
("(Reserved for $playername)" was resolved on the host). Instead we now
generate the description on the clients.
 2014-11-14 01:07:27 +01:00
gfgtdf
f9a3767a4d fix windows build 2014-11-14 01:07:26 +01:00
gfgtdf
a6237a1096 remove check for "human_ai" 
"human_ai" doesnt exist anymore so we can remove this check.
 2014-11-14 01:07:25 +01:00
Chris Beck
7fafcd8086 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-13 18:51:06 -05:00
Chris Beck
292452f11c travis: disable NLS on the C++11 build 
it is still timing out and i'm running out of options
 2014-11-13 18:50:18 -05:00
Ignacio R. Morelle
f80d8d1d17 Decrease campfire terrain frames duration from 200 to 140 ms 
This matches the ANIMATED_CAMPFIRE and ANIMATED_BRAZIER macros from
data/core/macros/image-utils.cfg and looks subjectively better.
 2014-11-13 20:25:14 -03:00
Ignacio R. Morelle
e56f8e6aa5 Add ANIMATION_08_140 terrain graphics macro 2014-11-13 20:25:12 -03:00
Chris Beck
859d46ebda seed_rng: add a missing part of boost uint32_t include 2014-11-13 17:58:31 -05:00
Chris Beck
33f8585057 add include of boost/version.hpp to seed_rng.cpp for version check 2014-11-13 17:06:39 -05:00
Chris Beck
c63191bb07 fixup gui2 tests for lua interpreter 2014-11-13 16:40:35 -05:00
Chris Beck
eb9ac4dd9b revert an accidental change in a previous commit, to gui2 scrollbar 
Partially reverts 2021a42d5bc27878abb1f20dd2523056d43aea1d
I had this on a testing branch but I didn't intend to commit.
 2014-11-13 16:39:41 -05:00
Chris Beck
692b18781a update RELEASE_NOTES 2014-11-13 15:20:05 -05:00
Chris Beck
bdfbf571fa update changelog 2014-11-13 14:34:15 -05:00
Chris Beck
510674d465 add lua console button to the gamestate inspector dialog 2014-11-13 14:28:56 -05:00
Chris Beck
15db12dec9 update changelog 2014-11-13 13:29:38 -05:00
Chris Beck
94728187af Merge branch 'lua_interpreter_dialog' 2014-11-13 13:25:24 -05:00
Chris Beck
617c81459e update changelog 2014-11-13 13:22:52 -05:00
Chris Beck
5fd8e5afcb add "ADJUST_ALPHA" image path function 2014-11-13 13:20:56 -05:00
Chris Beck
e93a974277 fix a bug in the header_times script 2014-11-13 11:47:03 -05:00
Chris Beck
2021a42d5b Add lua console 
- Add an internal command logger to the lua kernel base, and expose
this.
- Redirect the internal lua `print` to the command logger.
- Add an external logger registration system to lua kernel, in
addition to the internal one.
- Add a lua console dialog which binds to a lua kernel base and
permits to review the contents of the logger and issue new commands,
and report errors.
- Add a hotkey binding to launch the lua console "`"
- Adds tab completion support to the lua console
 2014-11-13 11:38:58 -05:00
gfgtdf
c64a1925df fix variable_info.cpp 
variable_as_array_h::operator() expects the range to be passed as a pair (startindex, endindex). We accidentally passed the range as (startindex, size) instead.

Shadowm reported bugs related to global variables but most likely this can also lead to segfaults in other situations (some uses of [set_variables]).
 2014-11-13 14:17:27 +01:00
gfgtdf
d0623f16da rename "current_player" -> "reserved_for" 
Conflicts:
	src/game_initialization/connect_engine.cpp
	src/game_initialization/connect_engine.hpp
 2014-11-13 01:42:44 +01:00
gfgtdf
005c99fc23 dont read "player_id" attribute 
its not persistent in savefiles nor it's a documented [side] attribute
 2014-11-13 01:32:37 +01:00
gfgtdf
a6e6326072 fix "player_id" during mp_connect/mp_wait 
the value of "player_id" is only used to set the userlist in mpwait in
case there is no other userlist available (usualy there is another list
available) adding a side number doesn't make sense.

We also use a std::set for gathering the player_id values to make sure
there is no player_id twice.
 2014-11-13 01:21:34 +01:00
gfgtdf
9d5504da33 fixup 'rename team::is_human -> is_local_human' 2014-11-13 01:07:22 +01:00
gfgtdf
ea2386a8a7 simplyfy conditional structure 2014-11-12 23:17:43 +01:00
gfgtdf
54e27d2d3f rename team::is_human() -> is_local_human 
and is_ai -> is_local_ai
 2014-11-12 23:11:15 +01:00
Chris Beck
9fdc91e8a9 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-11 15:48:21 -05:00
Chris Beck
eac22acff2 fixup include guards 2014-11-11 15:48:14 -05:00
gfgtdf
1114ef2e42 fixup comment 2014-11-11 20:56:05 +01:00
gfgtdf
f777c3ce18 get rid of preprocessor conditional 
having 2 different implementations (one for c++11 and one for c++03)
makes the code harder to maintain.
 2014-11-11 20:51:34 +01:00
gfgtdf
73b523a077 refactor variable_info.cpp 
this is a strict refactor which shouldn't change the compiled code.
 2014-11-11 20:51:33 +01:00
gfgtdf
a7ceb23eb2 rename variable_info_3 -> variable_info 
the only reason thart this was called variable_info_3 is that it was my
third try to implement it (my second try that used boost::variant for
the differnet states turned out to be too slow)
 2014-11-11 20:51:32 +01:00
Chris Beck
19caaa667a fixup b6e12ebf76c8a7fec216d9667e65e1798566f83d 2014-11-11 13:35:43 -05:00
Chris Beck
b6e12ebf76 fixup more includes 2014-11-11 13:32:03 -05:00
Chris Beck
c4014bc39c Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-11 12:41:14 -05:00