Commit graph

73397 commits

Author SHA1 Message Date
Jyrki Vesterinen
8ab4525034 Texture atlas generation itself 2019-03-31 16:52:23 +03:00
Jyrki Vesterinen
16f20d5286 High-level sprite packing code for the 'pack everything' case 2018-10-13 12:30:57 +03:00
Jyrki Vesterinen
62bbdab065 Low-level sprite packing code 2018-10-11 14:10:32 +03:00
Jyrki Vesterinen
af418d86f4 WIP: texture atlas class
Currently only loading images and applying IPFs is implemented.

Most code here is copy-pasted from picture.cpp, I'm planning to eventually
remove that file.

Next task is implementing the actual sprite packing.
2018-10-10 15:03:19 +03:00
Jyrki Vesterinen
c81095ac8b Really fix build 2018-09-29 13:50:41 +03:00
Jyrki Vesterinen
df37b11561 Fix build 2018-09-29 12:09:16 +03:00
Jyrki Vesterinen
6716227279 Thread pool can now receive tasks to do 2018-09-29 11:51:28 +03:00
Jyrki Vesterinen
9f1e4564df WIP: thread pool class
For now it's missing ability to, you know, actually run tasks.
2018-09-27 21:30:51 +03:00
Martin Hrubý (hrubymar10)
a18c475f38 Fix Xcode Project 2018-09-27 20:06:09 +03:00
Martin Hrubý (hrubymar10)
2973cedda2 Fix Xcode project after 3e96a3aa2c357c539c255dbe8b431f6857f8170a 2018-09-27 20:04:53 +03:00
Jyrki Vesterinen
34b7903d25 Add a shader class 2018-09-27 20:04:53 +03:00
Sofartin
7ed4e2c93a Fix xcode project after aff0465441c62f6932bf19ba42fbedeffc5fbf86 2018-09-27 20:04:53 +03:00
Jyrki Vesterinen
0992605c5d Add sprite, draw_op and vertex classes 2018-09-27 20:03:46 +03:00
Jyrki Vesterinen
73caa6da64 Add a texture class 2018-09-27 20:03:45 +03:00
Sofartin
6a18968df1 Fixed Xcode Project for OpenGL 2018-09-27 20:01:02 +03:00
pentarctagon
eec60d08aa Adds OpenGL/GLEW checks to scons.
Taken mostly verbatim from 3e2eba22a9
2018-09-27 20:00:01 +03:00
pentarctagon
ee59c2be97 Re-add travis' notifications. 2018-09-27 20:00:01 +03:00
pentarctagon
e0953798e4 Remove forgotten environment dump. 2018-09-27 20:00:01 +03:00
pentarctagon
4db3d913e6 Updates cmake and scons to be able to compile with OGL. 2018-09-27 20:00:01 +03:00
Jyrki Vesterinen
6e9576a282 Stop logging GL_VENDOR
I think the log output looks nicer without it in the end.
2018-09-27 20:00:01 +03:00
Sofartin
e2bbbbafd9 Fixed Xcode Project for OpenGL 2018-09-27 20:00:01 +03:00
Jyrki Vesterinen
695c8eebe8 Integrate GLEW to the Visual Studio project
I also removed USE_GL_RENDERING (OpenGL rendering is now used
unconditionally), moved initialization of gl::context out of the
constructor, and added some light logging about OpenGL (so that, in the
future with hardware-specific issues, we have a way to know which hardware
is affected).

This commit breaks build with anything except Visual Studio due to
requiring OpenGL and GLEW but not linking to them.
2018-09-27 19:56:22 +03:00
josteph
ae4ef058ed manpage: Fix option name typos and update documentation of --render-image. 2018-09-26 18:16:52 +11:00
jostephd
c55b0c6adb Commandline: Fix documentation of --render-image 2018-09-26 18:16:16 +11:00
josteph
c88a799b90 Help: Hide abilities with empty names.
Fixes empty name abilities in help in Liberty S1.
2018-09-26 18:14:37 +11:00
newfrenchy83
e395706309 Update Code::Blocks project (#3566) 2018-09-26 06:59:57 +03:00
josteph
4db974431d Unit Display: When the recruiting or recruited units is invisible, don't scroll to it.
When the enemy leader and the unit it recruits are both invisible,
scrolling to them would leak their location to the player.
2018-09-24 20:18:16 +03:00
josteph
9abdc20841 MP Create Game: Increase slider step size
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680
2018-09-23 17:02:42 +03:00
Jyrki Vesterinen
79206d92d5 Fix: Chance to hit wasn't protected from becoming negative
Manual merge of pull request #3550. Credit to @newfrenchy83.
2018-09-23 16:52:24 +03:00
mattsc
81ef9ea390
Merge pull request #3506 from mattsc/lua_ai_cleanup
Lua AI Cleanup
2018-09-22 06:18:33 -07:00
Jyrki Vesterinen
9536f3825e Fix #3567: error when trying to send an error message to the client
Simple_wml requires double quotes to be duplicated like this.
2018-09-22 12:29:52 +03:00
jostephd
3a3b752881 WML: Support [filter_side] in [item]. (#3533)
* WML: Support [filter_side] in [item].

If [filter_side] is present then "team_name" is ignored.

Fixes #1477.

* WML: Compare [item]team_name to [side]team_name using intersection.

Fixes problems with substrings and when one or the other is a
comma-separated list. See #3533

* WML: Rename [item][filter_side] to [item][filter_team]

* Add changelog entry
2018-09-21 21:11:08 -04:00
josteph
b64f4b42d6 Commandline: --campaign-skip-story skips [message]s during prestart and start events 2018-09-21 12:59:15 +03:00
josteph
1d1d260350 Commandline: Encapsulate skip_story in play_controller 2018-09-21 12:17:59 +03:00
josteph
f7be872da2 Commandline: Add --campaign-skip-story option
Fixes #3472
2018-09-21 12:17:40 +03:00
Sergey Popov
63d06f8a38
Merge pull request #3555 from jostephd/objectives-prestart-for-master
Fwdport b7cb36a711
2018-09-21 11:02:49 +03:00
Nils Kneuper
639c5087b9 updated Spanish translation 2018-09-20 20:46:41 +02:00
Nils Kneuper
9acb15674f updated Italian translation 2018-09-20 20:44:53 +02:00
V N
6010ffe98e prevent double execution of on_event.lua
makes it safe to dofile("on_event.lua")
2018-09-19 18:09:50 +02:00
Iris Morelle
2ea2a4da49 pofix: 1.14 announcement rules for 1.14.5
[ci skip]
2018-09-17 00:24:22 -03:00
Iris Morelle
7bb419abbf Multiple fixes to the changelog to make it look good on Steam
[ci skip]
2018-09-17 00:09:21 -03:00
Iris Morelle
a38466d0b5 Fix changelog indentation
[ci skip]
2018-09-16 23:25:24 -03:00
Severin Glöckner
b8d8be3436 THoT: replace [filter_wml]
[ci skip]
2018-09-16 00:46:27 +02:00
Severin Glöckner
e5b4fcdfd3 fixup
[ci skip]
2018-09-16 00:42:57 +02:00
Severin Glöckner
56111818e9 THoT: add potential workaround for #3547
It's anyway a good idea to change this code.

[ci skip]
2018-09-16 00:34:19 +02:00
Andras Szell
b16b7f032a Tutorial S1: display an undo message if impossible to reach next target
Fixes #3039

Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.

[ci skip]
2018-09-16 00:23:31 +02:00
Jyrki Vesterinen
57709d4ae4 Synchronized changelog with 1.14
[ci skip]
2018-09-15 20:58:22 +03:00
Nils Kneuper
c1ffe4ce39 updated Hungarian translation 2018-09-15 12:24:30 +02:00
Severin Glöckner
09f418bdd8 ANL: fix village gold being too low
[ci skip]
2018-09-15 01:12:12 +02:00
josteph
9f58a80635 Add const annotation to new function 2018-09-14 22:52:54 +00:00