Menu
▾
▴
glestae-git — Receive commit notifications
You can subscribe to this list here.
| 2011 |
Jan
(31) |
Feb
(5) |
Mar
(8) |
Apr
(62) |
May
(36) |
Jun
(30) |
Jul
(16) |
Aug
(3) |
Sep
(8) |
Oct
(29) |
Nov
(13) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(3) |
Feb
(8) |
Mar
(3) |
Apr
(4) |
May
(3) |
Jun
(10) |
Jul
(2) |
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
(3) |
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: James M. <si...@us...> - 2015-05-09 13:09:23
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, windows-fixage has been created
at 2be1e8e08bbf9e5d8a4f5e9e4d73b0592e7b810c (commit)
- Log -----------------------------------------------------------------
commit 2be1e8e08bbf9e5d8a4f5e9e4d73b0592e7b810c
Author: James McCulloch <si...@gm...>
Date: Sat May 9 22:10:57 2015 +1000
cmake fixage/updates
* alt name for ogg lib
* exclude specific c-runtimes because vc11 seems to like to try and link all 4 and see what happens
* add manifest to exe to tell Win8.1+ that we are dpi aware (so GetSystemMetrics() doesn't lie to us)
commit c8fdbb0892c241ac6c64f66df81cf68f48bdc21d
Author: James McCulloch <si...@gm...>
Date: Sat May 9 13:11:25 2015 +1000
fix luaL_checkint() doesn't exist anymore? [=>luaL_checkinteger()]
commit b0a368b73a83887d9c48765c9f384c8abc7fe52c
Author: James McCulloch <si...@gm...>
Date: Sat May 9 13:10:18 2015 +1000
crappy fix for type ambiguity on vc11
-----------------------------------------------------------------------
hooks/post-receive
--
glestae
|
|
From: Nathan T <hai...@us...> - 2014-07-13 01:43:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, dedicated_server has been updated
via 2c307ad9bc1085de8b0c3ba66faf00a5e4a98f74 (commit)
via 2090bd577bc4d5a54879eb87439aa70e2c88c131 (commit)
via 670a4fd1691e541497350899735c1f6a127e0596 (commit)
via a867df096ba29ea2d1b20a95c2e12b1d6d94cba9 (commit)
from 0fd98cabce63ca636e93992c3577404ad3eec57e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2c307ad9bc1085de8b0c3ba66faf00a5e4a98f74
Author: hailstone3 <hai...@us...>
Date: Fri Jul 4 11:20:52 2014 +1000
Fixed tileset and map objects not being the same on multiplayer.
commit 2090bd577bc4d5a54879eb87439aa70e2c88c131
Author: hailstone3 <hai...@us...>
Date: Sun Jun 29 17:29:10 2014 +1000
fixed single player commands not going through
commit 670a4fd1691e541497350899735c1f6a127e0596
Author: hailstone3 <hai...@us...>
Date: Sun Jun 29 16:43:51 2014 +1000
Network stuff is running with turn manager. Commands appear to be executed in order and at almost same time but still has obvious desync issues.
commit a867df096ba29ea2d1b20a95c2e12b1d6d94cba9
Author: hailstone3 <hai...@us...>
Date: Fri Jun 27 15:55:10 2014 +1000
change seed to unit id for carried unit projectile
-----------------------------------------------------------------------
Summary of changes:
source/game/entities/object.cpp | 4 +-
source/game/entities/object.h | 5 +-
source/game/entities/unit.cpp | 5 +-
source/game/game/game_constants.h | 2 +-
source/game/game/game_settings.h | 5 ++-
source/game/network/client_interface.cpp | 86 ++++++++++++++++--------------
source/game/network/network_message.cpp | 32 ++++++-----
source/game/network/network_message.h | 5 +-
source/game/network/server_interface.cpp | 63 +++++++++++----------
source/game/world/map.cpp | 4 +-
source/game/world/sim_interface.cpp | 39 +++++++-------
source/game/world/sim_interface.h | 5 +--
source/game/world/tileset.cpp | 11 ++--
source/game/world/tileset.h | 5 ++-
source/game/world/turn_manager.cpp | 4 +-
source/game/world/turn_manager.h | 2 +-
source/game/world/world.cpp | 33 ++++++------
source/game/world/world.h | 4 +-
18 files changed, 166 insertions(+), 148 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Nathan T <hai...@us...> - 2014-06-27 02:29:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, dedicated_server has been updated
via 0fd98cabce63ca636e93992c3577404ad3eec57e (commit)
via 8062231b72ac6e773ab9fb4e854786f90855d96d (commit)
via 4fa9d664c7e172ff722ee48d44a6fc750fb04c82 (commit)
via 08a5f5fc5a5293b10ff077a63f7fe22458bb457b (commit)
via c9212f6b1c65202ca73e1a4f39364fea16a5a908 (commit)
via c9bf9eb873a3feb7ba0ceca0daf231b6a2db304a (commit)
via 6a9c67cb98fd7a1d2f4fd425fe731866176a0a5d (commit)
via 83f22f3fdfa25c1910e6a1cffbd676c7dd136bad (commit)
via 6fcb5dc3dee6d4106faae565aa39b29a2d956832 (commit)
via be12fc1789e0fd75384d0502da2dd12bfd5f7697 (commit)
via 17d55c58d59d8172e5365a5306822884fe72a6c8 (commit)
via 2750d2cb69cfa305b90ed5e5983b95b43050c9a3 (commit)
via 706088012d7e47edd0ad1e782ce818f5db55cef4 (commit)
via f2dbec5c546d627ef9a9388310c73c8db6d40c66 (commit)
via 17679aa0772d4402f0983a52914235d881b723cf (commit)
via 09771ae92ab2d3ce5fd6af7e81d2aad1c1765c37 (commit)
via 77c8c278d0c72ca5eccd6fbd26a838fb95314d5b (commit)
via 9f655559ceb86956db946d6db63cb607dad54414 (commit)
via d0bde21bb2826a789610aa77dc61719873906e7a (commit)
via 61f0c817b84d22077d6913269874b57b208a2034 (commit)
via 40cf85796e8e5cd936d28d17eb3df39de7861a8b (commit)
via db0efb084f86e8b288d779f5d348195aada2dfca (commit)
via af9b47142a10a5395a4eaa1e7d82ca235a7c53cf (commit)
via f090f68d04509f9642d82331b66f2228b8d06491 (commit)
via 6056e33bffb13d409e14aa5c1299c48ff24f26d0 (commit)
via d6ae635d78cff72e15548ed9badb3e3de5aa64a8 (commit)
via d404c6bf97fa9ddd3331b12182dadcbfb5c967f7 (commit)
via 1e9842bb7f90fbcb00625b196169963aa11e175a (commit)
via 20a37b3595b3758f65429741ba909f9a5d501f66 (commit)
via 85f2ba8ff98720e1393dde4d802926b2742be0e4 (commit)
via b58d58f3e70c6a16170a3f8e37643ffe0442af1b (commit)
via 20241ccc5e53fc7a00575f63899e7790add3c7fc (commit)
via 13db9cfb92b7690334d3511402fda0b4168e5e1a (commit)
via 53e7ed8eb48fb75573ca850da82aa96e8e015e63 (commit)
via 8196efe6bb4cc2d65906a033aff10d2d3abb5f00 (commit)
via e931ed369f2d804c1cb71506a2c7a9c70c110f67 (commit)
via 0873842ac138e11ccf7f7a4272c82d407b3cf0e5 (commit)
via 48781173060b532fcc356f29dce2937deffde25f (commit)
via 2cc1cad9e1d57624917b19e1ee736f4691f7316c (commit)
via 095d4f7ff3ea7cb3b9754f67bcdbbc722683e9f2 (commit)
via 913b3da4314f48da0be9f588c9bbe99f51fcb51b (commit)
via ead3424c9ff79673ef5ee56ac0c4a6687da51317 (commit)
via e7210a0af52683304ff8d6a6c5083fcade4084d7 (commit)
via a0b422b0cab7e23ae20f4ae7576945c45eab7d32 (commit)
via 6c291ca8afaec2e0e130430b588bbd19111d5d1d (commit)
via cbf3b75c9fc438777724f39eae19353c7418da17 (commit)
via 694eafd323d28f97d61a911640e89db9daf5aed3 (commit)
via 74b873e33f4526b0d47c3185a941994b5fed782b (commit)
via 1f6c9c8a480e7c5e3fa02247c9a1107200667b68 (commit)
via a95023bd5e027c8d620337a66542a862768ecb3e (commit)
via 55ba08283105628538d41bfbb064e7e9873ae397 (commit)
via bbc3cfd10c514a2f996ee377d54cc25ae7a5ecab (commit)
via d525a496259ec016c11a53446dc0f98a2dba71cf (commit)
via 482f271aa1a974da91870131ca8613b48968d7f2 (commit)
via f768e47adefb39d38e985a9fa5524da5b35a75ba (commit)
via b1af5428b5b6a3dc9c2b0dbc2933a52cde00846c (commit)
via b5d8373d108b9823d2f8aa02c3b86ffbfaa414d8 (commit)
via 3d5e24e92d4bd94a5318d25f707e5180d1a45f58 (commit)
via c17dbd0c8fcf85a24645ada2efadf2762bb750aa (commit)
via 8aaea9fdd86e7ea23d9c8c8c19fd360e3f4cf8dc (commit)
via b9cb4d636119f4ae705ce92d5715a4cd3e8fcc49 (commit)
via 87b648ae111062f052fc8380ead72a3ca6e47dd5 (commit)
via 39e7413e6cea4f10ff2ad392b659730a43877ca0 (commit)
via 65d59c3e99d67b4f7a8d7a140b7788846491f5ba (commit)
via b8e5349c88d566f5a2049050f491510c9126eb5a (commit)
via 64b785f911c4db6efbe6f81a722b1b98da48d7a9 (commit)
via 5a5177b6098da5d0c6429ca85bd1968574a813d4 (commit)
via af742d511477cfd4947a426e2027e1bbb7cbebda (commit)
via 33ea21bcc69741e9179efae452d1f4046e2893b5 (commit)
via 1b73b888b8e3e1bd23ffe00b27a2a409ce1af6fa (commit)
via 41b5a82d2ae8c15da110bb8bf8539fe8e86e9c6b (commit)
via 94f66cb715b2aef37323afd93aa3f2f93bf53603 (commit)
via 36fd73cc7b4882f1076efebc99b858f5ae898f7b (commit)
via 26b239499e124c9259454177b9573dcf47f6757d (commit)
via bc60e8954f61733cd0ea02d8ce928150792371c1 (commit)
via 1be78ebc6e5382e247fc52835f7978be17e4d970 (commit)
via 1c3f82fa747ded99300d6175f244768c5aa9206a (commit)
via 0fb48acb3fbfd03430a1bcd4abf7ba5a67452e8f (commit)
via 074ce751f133f5779a45e1d11ea5f7a11e219754 (commit)
via 2d2dd34e761a42954e417bd220b6d90851838ae5 (commit)
via 0f62e18eafe1a3f3ac92bf2bde74d42e66e1064f (commit)
via f0f98310c44c7ca4e77a5782a6bcaa927fd66251 (commit)
via cd877598ef1fa4af0a178d7cfe668417dc22a7a3 (commit)
via 8162827911777cb3151b19f7f95675ea33d39d6a (commit)
via 558fb7a283e00afd325e9255d4c57f4d65cf2cca (commit)
via e679653f0d97f6cd62947b615f22fe7ea4291d59 (commit)
via ef5aa0283302d75d2ed7d34209985d1436c29d98 (commit)
via 20f31e158f1e5ea8eb458517f56638e43676f681 (commit)
via a4861798c6105eceeb445a4c0cb9a3c86c01dce3 (commit)
via f7c89b950d42f03397ec4cea4a7d800c59d82749 (commit)
via 458e855a0d92b9812cc8cf3b0720223d83239171 (commit)
via 5de84873130ed12952197ffeaf86cc8feec4fed1 (commit)
via 56156ac614eeee83235519a9b15add15de455e48 (commit)
via 3118a87cb6b273184c325e6bc58e16aaf1ed3b0f (commit)
via 854041e99aaea652b998e9245db10b7d99a7e647 (commit)
via 1d7bd56fb59b348c9fc2feceef5327857acdaa27 (commit)
via 606c86aa809fed70133ef5eadcb8b25c1989acc8 (commit)
via 465c03f941995e1b41459010ca5f3887cfd35487 (commit)
via b1e1fd998337cc3509c7c6df14870ea8c555c057 (commit)
via de75e52f01dec48f04bb43843c8011bc5b56546b (commit)
via e3257cf6375580745f9bc365bd842544f8907852 (commit)
via 133df85963826bd8a10ec36e0315a37468aa3e09 (commit)
via 7ea69b212207e233d1aecc4ff2233005c0131380 (commit)
via bf260781a2f1ddadab6b3a819ad7e06063b0a900 (commit)
via 8bf94111db85696a8a45977d2b54093acf198933 (commit)
via f70f8c9fbe0bc0880cf4f6664785c2a7d51325e7 (commit)
via 5754797dd6270cf371a070580d56039728e954a6 (commit)
via b37801a868c09ce850f44322626071969ebd02f2 (commit)
from 21174b7b38190bfb9e23ca48eeef38a36fecdd30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0fd98cabce63ca636e93992c3577404ad3eec57e
Merge: 8062231 c9212f6
Author: hailstone3 <hai...@us...>
Date: Fri Jun 27 10:26:29 2014 +1000
Merge branch 'master' into dedicated_server
commit 8062231b72ac6e773ab9fb4e854786f90855d96d
Merge: 4fa9d66 913b3da
Author: hailstone3 <hai...@us...>
Date: Fri Jun 27 09:33:11 2014 +1000
Merge branch 'master' into dedicated_server
commit 4fa9d664c7e172ff722ee48d44a6fc750fb04c82
Merge: 08a5f5f a95023b
Author: hailstone3 <hai...@us...>
Date: Fri Jun 27 09:08:11 2014 +1000
Merge branch 'master' into dedicated_server
commit 08a5f5fc5a5293b10ff077a63f7fe22458bb457b
Merge: 77c8c27 e679653
Author: hailstone3 <hai...@us...>
Date: Fri Jun 27 07:33:04 2014 +1000
Merge branch 'master' into dedicated_server
commit 77c8c278d0c72ca5eccd6fbd26a838fb95314d5b
Author: hailstone3 <hai...@us...>
Date: Sun Apr 21 11:45:07 2013 +1000
New turn based system is working for local games.
commit 9f655559ceb86956db946d6db63cb607dad54414
Author: hailstone3 <hai...@us...>
Date: Tue Mar 12 20:35:41 2013 +1000
Removed sim_interface.h reliance on network_message.h
commit d0bde21bb2826a789610aa77dc61719873906e7a
Author: hailstone3 <hai...@us...>
Date: Tue Mar 12 18:31:54 2013 +1000
Calculating SkillCycleTable locally instead of client receiving it from server to make things a little simpler. (might add this back in later)
commit 1d7bd56fb59b348c9fc2feceef5327857acdaa27
Author: hailstone3 <hai...@us...>
Date: Sun Feb 12 08:33:30 2012 +1000
Add unit id to projectile update.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 10 +-
.../data/core/misc_textures/fire-particle1.bmp | Bin 0 -> 12342 bytes
.../data/core/misc_textures/fire-particle2.bmp | Bin 0 -> 12342 bytes
.../data/core/misc_textures/smoke-particle.tga | Bin 0 -> 3116 bytes
data/game/gae/data/defeat_messages/gd.txt | 51 ++
data/game/gae/data/lang/ca.lng | 143 -----
data/game/gae/data/lang/cs.lng | 173 ------
data/game/gae/data/lang/da_DK.lng | 139 -----
data/game/gae/data/lang/de.lng | 192 -------
data/game/gae/data/lang/el.lng | 166 ------
data/game/gae/data/lang/en.lng | 11 +
data/game/gae/data/lang/eu.lng | 147 -----
data/game/gae/data/lang/fr.lng | 169 ------
data/game/gae/data/lang/gd.lng | 458 ++++++++++++++++
data/game/gae/data/lang/gl.lng | 163 ------
data/game/gae/data/lang/he.lng | 141 -----
data/game/gae/data/lang/hu.lng | 177 ------
data/game/gae/data/lang/it.lng | 323 +++++++++++
data/game/gae/data/lang/nl.lng | 139 -----
data/game/gae/data/lang/no_NO.lng | 175 ------
data/game/gae/data/lang/pl_PL.lng | 139 -----
data/game/gae/data/lang/pt_BR.lng | 169 ------
data/game/gae/data/lang/ro.lng | 259 ---------
data/game/gae/data/lang/sk_SK.lng | 144 -----
data/game/gae/data/lang/sr.lng | 152 ------
data/game/gae/data/lang/tr.lng | 169 ------
.../glest_classic/storming/storming_gd.lng | 11 +
.../advanced_tutorial/advanced_tutorial_gd.lng | 39 ++
.../basic_tutorial/basic_tutorial_gd.lng | 37 ++
data/game/gae/shaders/basic.xml | 180 -------
data/game/gae/shaders/bump.xml | 153 ------
data/game/gae/shaders/misc_model/team_tint.xml | 172 ------
.../magitech/factions/magic/lang/magic_gd.lng | 104 ++++
.../magitech/factions/magic/lang/magic_it.lng | 170 ++++++
.../techs/magitech/factions/tech/lang/tech_gd.lng | 109 ++++
.../techs/magitech/factions/tech/lang/tech_it.lng | 170 ++++++
data/game/techs/magitech/lang/magitech_gd.lng | 31 ++
data/game/techs/magitech/lang/magitech_it.lng | 170 ++++++
.../shibboleth/factions/alpha/lang/alpha_gd.lng | 128 +++++
.../factions/alpha/units/archer/archer.xml | 1 +
.../factions/alpha/units/castle/castle.xml | 6 +-
.../factions/alpha/units/catapult/catapult.xml | 2 +-
.../alpha/units/defense_tower/defense_tower.xml | 8 +-
.../shibboleth/factions/alpha/units/farm/farm.xml | 2 +-
.../factions/alpha/units/merlin/merlin.xml | 3 +-
.../factions/alpha/units/swordman/swordman.xml | 2 +-
.../factions/alpha/units/technician/technician.xml | 2 +-
.../shibboleth/factions/alpha/units/wall/wall.xml | 6 +-
data/game/techs/shibboleth/lang/shibboleth_gd.lng | 43 ++
prettify-crash.sh | 43 ++
source/CMakeLists.txt | 5 +
source/g3d_viewer/gae_g3dviewer.desktop | 1 +
source/gae-mime.xml | 16 +
source/game/config.db | 1 +
source/game/entities/faction.cpp | 32 +-
source/game/entities/game_particle.cpp | 277 +++++++---
source/game/entities/game_particle.h | 54 ++-
source/game/entities/object.cpp | 1 +
source/game/entities/object.h | 9 +-
source/game/entities/unit.cpp | 194 ++++---
source/game/entities/unit.h | 33 +-
source/game/facilities/logger.cpp | 29 +-
source/game/facilities/pos_iterator.cpp | 25 +-
source/game/facilities/pos_iterator.h | 72 ++--
source/game/game/commander.h | 1 -
source/game/game/game.cpp | 64 +--
source/game/game/game.h | 6 +-
source/game/game/game_constants.h | 1 +
source/game/game/options.cpp | 4 +-
source/game/global/config.cpp | 2 +
source/game/global/config.h | 3 +
source/game/global/core_data.cpp | 5 +-
source/game/global/core_data.h | 8 +-
source/game/graphics/debug_renderer.cpp | 4 +-
source/game/graphics/debug_renderer.h | 2 +
source/game/graphics/renderer.cpp | 545 +++++++++++---------
source/game/graphics/renderer.h | 49 ++-
source/game/graphics/scene_culler.h | 86 ---
source/game/gui/debug_widgets.cpp | 15 +
source/game/gui/debug_widgets.h | 3 +
source/game/gui/display.cpp | 8 +-
source/game/gui/resource_bar.cpp | 28 +-
source/game/gui/user_interface.cpp | 13 +-
source/game/gui/user_interface.h | 7 +
source/game/main/battle_end.cpp | 6 +-
source/game/main/battle_end.h | 1 +
source/game/main/main.cpp | 15 +-
source/game/main/program.cpp | 1 +
source/game/menu/main_menu.cpp | 19 +-
source/game/menu/menu_background.cpp | 2 +-
source/game/menu/menu_state_join_game.cpp | 10 +-
source/game/menu/menu_state_new_game.cpp | 2 +-
source/game/network/client_interface.cpp | 37 ++-
source/game/network/client_interface.h | 5 +-
source/game/network/connection_slot.cpp | 5 +-
source/game/network/connection_slot.h | 4 +
source/game/network/network_message.cpp | 20 +-
source/game/network/network_message.h | 17 +
source/game/network/network_types.cpp | 1 +
source/game/network/network_types.h | 3 +-
source/game/network/server_interface.cpp | 36 +-
source/game/prototypes/cmd_types_general.cpp | 20 +-
source/game/prototypes/effect_type.cpp | 21 +-
source/game/prototypes/effect_type.h | 6 +-
source/game/prototypes/particle_type.cpp | 135 ++++-
source/game/prototypes/particle_type.h | 98 +++-
source/game/prototypes/resource_type.cpp | 11 +
source/game/prototypes/resource_type.h | 18 +-
source/game/prototypes/skill_type.cpp | 27 +-
source/game/prototypes/skill_type.h | 4 +-
source/game/script/script_manager.cpp | 8 +-
source/game/widgets/mouse_cursor.cpp | 20 +
source/game/widgets/mouse_cursor.h | 16 +-
source/game/widgets/widget_window.cpp | 27 +-
source/game/widgets/widget_window.h | 1 +
source/game/widgets/widgets_base.cpp | 5 +-
source/game/world/map.cpp | 4 +-
source/game/world/map.h | 2 +-
source/game/world/sim_interface.cpp | 52 ++-
source/game/world/sim_interface.h | 20 +-
source/game/world/tileset.cpp | 2 +-
source/game/world/turn_manager.cpp | 90 ++++
source/game/world/turn_manager.h | 113 ++++
source/game/world/world.h | 4 +-
source/glexemel/G3D/g3d.desktop | 17 +
source/glexemel/G3D/main.js | 169 ++++++
source/glexemel/README | 30 +-
source/glexemel/g3d_support.py | 560 ++++++++++++++------
source/map_editor/gae_mapeditor.desktop | 1 +
.../include/graphics/gl/model_renderer_gl.h | 5 +-
source/shared_lib/include/graphics/gl/opengl.h | 1 +
.../include/graphics/gl/particle_renderer_gl.h | 11 +-
.../shared_lib/include/graphics/model_renderer.h | 18 +-
source/shared_lib/include/graphics/particle.h | 108 +++-
source/shared_lib/include/lang_features.h | 4 +-
source/shared_lib/include/math/math_util.h | 111 ++++
source/shared_lib/include/math/vec.h | 4 +-
source/shared_lib/include/platform/timer.h | 1 +
source/shared_lib/include/xml/xml_parser.h | 9 +
.../sources/graphics/gl/model_renderer_gl.cpp | 44 ++-
source/shared_lib/sources/graphics/gl/opengl.cpp | 66 +--
.../sources/graphics/gl/particle_renderer_gl.cpp | 111 +++--
.../shared_lib/sources/graphics/gl/texture_gl.cpp | 59 ++-
source/shared_lib/sources/graphics/particle.cpp | 104 +++-
source/shared_lib/sources/lua/lua_script.cpp | 8 +
source/shared_lib/sources/physfs/MemFileOps.cpp | 1 +
.../sources/platform/sdl/platform_util.cpp | 24 +-
.../sources/sound/ds8/sound_player_ds8.cpp | 171 +++----
.../sources/sound/openal/sound_player_openal.cpp | 8 +-
149 files changed, 4813 insertions(+), 4724 deletions(-)
create mode 100644 data/game/data/core/misc_textures/fire-particle1.bmp
create mode 100644 data/game/data/core/misc_textures/fire-particle2.bmp
create mode 100644 data/game/data/core/misc_textures/smoke-particle.tga
create mode 100644 data/game/gae/data/defeat_messages/gd.txt
delete mode 100644 data/game/gae/data/lang/ca.lng
delete mode 100644 data/game/gae/data/lang/cs.lng
delete mode 100644 data/game/gae/data/lang/da_DK.lng
delete mode 100644 data/game/gae/data/lang/de.lng
delete mode 100644 data/game/gae/data/lang/el.lng
delete mode 100644 data/game/gae/data/lang/eu.lng
delete mode 100644 data/game/gae/data/lang/fr.lng
create mode 100644 data/game/gae/data/lang/gd.lng
delete mode 100644 data/game/gae/data/lang/gl.lng
delete mode 100644 data/game/gae/data/lang/he.lng
delete mode 100644 data/game/gae/data/lang/hu.lng
create mode 100644 data/game/gae/data/lang/it.lng
delete mode 100644 data/game/gae/data/lang/nl.lng
delete mode 100644 data/game/gae/data/lang/no_NO.lng
delete mode 100644 data/game/gae/data/lang/pl_PL.lng
delete mode 100644 data/game/gae/data/lang/pt_BR.lng
delete mode 100644 data/game/gae/data/lang/ro.lng
delete mode 100644 data/game/gae/data/lang/sk_SK.lng
delete mode 100644 data/game/gae/data/lang/sr.lng
delete mode 100644 data/game/gae/data/lang/tr.lng
create mode 100644 data/game/gae/scenarios/glest_classic/storming/storming_gd.lng
create mode 100644 data/game/gae/scenarios/glest_tutorials/advanced_tutorial/advanced_tutorial_gd.lng
create mode 100644 data/game/gae/scenarios/glest_tutorials/basic_tutorial/basic_tutorial_gd.lng
delete mode 100644 data/game/gae/shaders/basic.xml
delete mode 100644 data/game/gae/shaders/bump.xml
delete mode 100644 data/game/gae/shaders/misc_model/team_tint.xml
create mode 100644 data/game/techs/magitech/factions/magic/lang/magic_gd.lng
create mode 100644 data/game/techs/magitech/factions/magic/lang/magic_it.lng
create mode 100644 data/game/techs/magitech/factions/tech/lang/tech_gd.lng
create mode 100644 data/game/techs/magitech/factions/tech/lang/tech_it.lng
create mode 100644 data/game/techs/magitech/lang/magitech_gd.lng
create mode 100644 data/game/techs/magitech/lang/magitech_it.lng
create mode 100644 data/game/techs/shibboleth/factions/alpha/lang/alpha_gd.lng
create mode 100644 data/game/techs/shibboleth/lang/shibboleth_gd.lng
create mode 100755 prettify-crash.sh
create mode 100644 source/gae-mime.xml
create mode 100644 source/game/world/turn_manager.cpp
create mode 100644 source/game/world/turn_manager.h
create mode 100644 source/glexemel/G3D/g3d.desktop
create mode 100644 source/glexemel/G3D/main.js
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-12-26 14:06:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via c9212f6b1c65202ca73e1a4f39364fea16a5a908 (commit)
from c9bf9eb873a3feb7ba0ceca0daf231b6a2db304a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c9212f6b1c65202ca73e1a4f39364fea16a5a908
Author: tetzank <te...@us...>
Date: Thu Dec 26 14:59:15 2013 +0100
blender addon: recalculate normals after rotation
When exporting with "rotate to glest orientation" checked, only the vertices
are rotated, not the normals. This leads to weird lighting effects on the
model. All normals are now recalculated after the rotation which should fix
this problem.
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-12-16 14:48:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via c9bf9eb873a3feb7ba0ceca0daf231b6a2db304a (commit)
from 6a9c67cb98fd7a1d2f4fd425fe731866176a0a5d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c9bf9eb873a3feb7ba0ceca0daf231b6a2db304a
Author: tetzank <te...@us...>
Date: Mon Dec 16 15:42:28 2013 +0100
blender addon: remove duplicates on import
When importing meshes remove all duplicated vertices. Blender can handle
multiple texcoords per vertex and it makes editing easier. It uses the bmesh
operators API which was introduced in blender 2.65. Older versions won't work.
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-12-11 19:50:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 6a9c67cb98fd7a1d2f4fd425fe731866176a0a5d (commit)
from 83f22f3fdfa25c1910e6a1cffbd676c7dd136bad (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6a9c67cb98fd7a1d2f4fd425fe731866176a0a5d
Author: tetzank <te...@us...>
Date: Wed Dec 11 13:14:46 2013 +0100
blender addon: fixed vertex duplication and animation import
When a vertex got duplicated because it has a different texcoord, it was not
checked if this vertex-texcoord-combination was created before. So we get
unnecessary duplicates with exact same vertex-texcoord-pair (taking part in
different faces). This is now hopefully checked correctly.
When importing the animation of a model, the last shapekey wasn't activated in
Blender for the last frame. So, the last frame was the same as the first
because the first frame is the normal model with no shapekey activated. This
should be fixed now too.
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 93 +++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 40 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-10-19 12:10:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 83f22f3fdfa25c1910e6a1cffbd676c7dd136bad (commit)
from 6fcb5dc3dee6d4106faae565aa39b29a2d956832 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 83f22f3fdfa25c1910e6a1cffbd676c7dd136bad
Author: tetzank <te...@us...>
Date: Sat Oct 19 16:38:41 2013 +0200
added shell script to prettify crash log
The script demangles the name of the function with c++filt. It also converts
the address to a line number in a source file with addr2line. Both programs are
part of binutils. For usage see head of script.
-----------------------------------------------------------------------
Summary of changes:
prettify-crash.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
create mode 100755 prettify-crash.sh
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2013-08-27 08:56:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 6fcb5dc3dee6d4106faae565aa39b29a2d956832 (commit)
from be12fc1789e0fd75384d0502da2dd12bfd5f7697 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6fcb5dc3dee6d4106faae565aa39b29a2d956832
Author: James McCulloch <si...@gm...>
Date: Tue Aug 27 18:55:25 2013 +1000
fix crash introduced with last commit.
-----------------------------------------------------------------------
Summary of changes:
source/game/gui/debug_widgets.cpp | 4 ++++
source/game/gui/debug_widgets.h | 1 +
2 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2013-08-27 02:39:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via be12fc1789e0fd75384d0502da2dd12bfd5f7697 (commit)
from 17d55c58d59d8172e5365a5306822884fe72a6c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be12fc1789e0fd75384d0502da2dd12bfd5f7697
Author: James McCulloch <si...@gm...>
Date: Mon Aug 26 18:34:26 2013 +1000
fix debug mode check-box not synced with reality
-----------------------------------------------------------------------
Summary of changes:
source/game/gui/debug_widgets.cpp | 11 +++++++++++
source/game/gui/debug_widgets.h | 2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-08-18 10:56:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 17d55c58d59d8172e5365a5306822884fe72a6c8 (commit)
from 2750d2cb69cfa305b90ed5e5983b95b43050c9a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 17d55c58d59d8172e5365a5306822884fe72a6c8
Author: tetzank <te...@us...>
Date: Sun Aug 18 12:16:55 2013 +0200
some minor build fixes for linux
Replaced unknown type 'byte' with 'unsigned char'. Should have the same size.
As clang fails in c++11 mode it's now only enabled for gcc. The problem is how
we check and enable c++11 features. Every compiler needs a special case in
source/shared_lib/include/lang_features.h. clang isn't handled there.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 9 ++++++---
source/shared_lib/include/graphics/particle.h | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-08-17 11:23:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 2750d2cb69cfa305b90ed5e5983b95b43050c9a3 (commit)
via 706088012d7e47edd0ad1e782ce818f5db55cef4 (commit)
from f2dbec5c546d627ef9a9388310c73c8db6d40c66 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2750d2cb69cfa305b90ed5e5983b95b43050c9a3
Author: tetzank <te...@us...>
Date: Sat Aug 17 12:47:49 2013 +0200
added new option 'fully opaque' to blender addon
This new option is a mesh property located in the G3D properties panel. If
enabled it sets the opacity of the mesh to 1.0, ignoring what's set as alpha in
materials which is normally used for the opacity. This allows the modder to set
alpha in materials to 0 and see the alpha effects of the texture in the 3D view
of blender.
commit 706088012d7e47edd0ad1e782ce818f5db55cef4
Author: tetzank <te...@us...>
Date: Fri Aug 16 19:53:13 2013 +0200
enabled c++11 by default for linux
Newer gcc versions throw many warnings because we use c++11 features like
override without enabling c++11. It's now enabled by default in cmake. Should
be fine for newer gcc versions.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 +++
source/glexemel/g3d_support.py | 12 ++++++++++--
source/shared_lib/include/lang_features.h | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2013-08-12 06:49:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via f2dbec5c546d627ef9a9388310c73c8db6d40c66 (commit)
via 17679aa0772d4402f0983a52914235d881b723cf (commit)
via 09771ae92ab2d3ce5fd6af7e81d2aad1c1765c37 (commit)
from 61f0c817b84d22077d6913269874b57b208a2034 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f2dbec5c546d627ef9a9388310c73c8db6d40c66
Author: silnarm <si...@us...>
Date: Wed Jul 4 17:23:18 2012 +1000
fix CrashProgramState not rendering when FrameBuffers are enabled
commit 17679aa0772d4402f0983a52914235d881b723cf
Author: silnarm <si...@us...>
Date: Tue Jul 3 09:10:07 2012 +1000
add smoke system, change particle colour handling, start refactoring/adding ParticleTypes
add 'inbuilt' smoke particle system.
handle particle colour with 'stepping' update rather than interpolating.
refactor ParticleType and children a little, insert DirectedParticleSystemType, add FreeProjectilType and CompoundParticleSystemType (latter 2 not used yet).
commit 09771ae92ab2d3ce5fd6af7e81d2aad1c1765c37
Author: silnarm <si...@us...>
Date: Mon Jul 2 17:33:26 2012 +1000
minor fixage
fix some broken template code in Vec4<>
add include so g3dviewer builds
-----------------------------------------------------------------------
Summary of changes:
.../data/core/misc_textures/fire-particle1.bmp | Bin 12342 -> 12342 bytes
.../data/core/misc_textures/fire-particle2.bmp | Bin 12342 -> 12342 bytes
.../data/core/misc_textures/smoke-particle.tga | Bin 0 -> 3116 bytes
source/game/entities/game_particle.cpp | 135 +++++++++++++++-----
source/game/entities/game_particle.h | 49 ++++++--
source/game/entities/unit.cpp | 16 ++-
source/game/entities/unit.h | 1 +
source/game/game/game.cpp | 1 -
source/game/global/core_data.cpp | 1 +
source/game/global/core_data.h | 2 +
source/game/main/program.cpp | 1 +
source/game/menu/main_menu.cpp | 1 -
source/game/prototypes/particle_type.cpp | 67 +++++++++--
source/game/prototypes/particle_type.h | 88 ++++++++++---
source/shared_lib/include/graphics/particle.h | 40 +++---
source/shared_lib/include/math/math_util.h | 1 +
source/shared_lib/include/math/vec.h | 4 +-
source/shared_lib/sources/graphics/particle.cpp | 17 ++-
18 files changed, 324 insertions(+), 100 deletions(-)
create mode 100644 data/game/data/core/misc_textures/smoke-particle.tga
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2013-02-01 11:39:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 61f0c817b84d22077d6913269874b57b208a2034 (commit)
via 40cf85796e8e5cd936d28d17eb3df39de7861a8b (commit)
from db0efb084f86e8b288d779f5d348195aada2dfca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 61f0c817b84d22077d6913269874b57b208a2034
Author: tetzank <te...@us...>
Date: Thu Jan 31 22:28:42 2013 +0100
added support for multiple texture slots to blender addon
Importer and exporter now support multiple texture slots. The first slot in the
material is the diffuse map, second and third slot are specular and normal map.
Other slots are ignored. All textures share the same coordinates.
The option to rotate the mesh is now enabled by default in importer and
exporter.
commit 40cf85796e8e5cd936d28d17eb3df39de7861a8b
Author: tetzank <te...@us...>
Date: Tue Jan 22 12:53:43 2013 +0100
added support for multiple textures to structure definition of G3D
It now supports multiple texture names in different texture slots. Second and
third texture is now marked as specular and normal map in the textures bitfield
of the mesh header. The amount of bits set in the bitfield describe how many
textures there are.
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/G3D/main.js | 28 +++++--
source/glexemel/g3d_support.py | 169 ++++++++++++++++++++++++++--------------
2 files changed, 131 insertions(+), 66 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-12-20 16:29:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via db0efb084f86e8b288d779f5d348195aada2dfca (commit)
from af9b47142a10a5395a4eaa1e7d82ca235a7c53cf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db0efb084f86e8b288d779f5d348195aada2dfca
Author: tetzank <te...@us...>
Date: Thu Dec 20 16:58:16 2012 +0100
blender addon: added option to rotate mesh to/from glest orientation
Exporter and Importer got a new option to rotate the mesh from default blender
orientation to glest orientation, or vice versa. I also added a wiki and forum
link to the addon info.
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 50 +++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 13 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-12-18 15:44:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via af9b47142a10a5395a4eaa1e7d82ca235a7c53cf (commit)
from f090f68d04509f9642d82331b66f2228b8d06491 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit af9b47142a10a5395a4eaa1e7d82ca235a7c53cf
Author: tetzank <te...@us...>
Date: Mon Dec 17 17:07:34 2012 +0100
blender export: only run g3dviewer when export was successful;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-12-17 11:56:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via f090f68d04509f9642d82331b66f2228b8d06491 (commit)
from 6056e33bffb13d409e14aa5c1299c48ff24f26d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f090f68d04509f9642d82331b66f2228b8d06491
Author: tetzank <te...@us...>
Date: Mon Dec 17 12:52:36 2012 +0100
blender import: fixed import of old G3Dv3 models;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-12-07 18:28:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 6056e33bffb13d409e14aa5c1299c48ff24f26d0 (commit)
via d6ae635d78cff72e15548ed9badb3e3de5aa64a8 (commit)
from d404c6bf97fa9ddd3331b12182dadcbfb5c967f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6056e33bffb13d409e14aa5c1299c48ff24f26d0
Author: tetzank <te...@us...>
Date: Thu Dec 6 20:36:32 2012 +0100
- associate .g3d with g3dviewer and .gbm with map editor on linux;
commit d6ae635d78cff72e15548ed9badb3e3de5aa64a8
Author: tetzank <te...@us...>
Date: Thu Dec 6 20:32:44 2012 +0100
blender export: - added option to run g3dviewer after export;
-----------------------------------------------------------------------
Summary of changes:
source/CMakeLists.txt | 5 +++
source/g3d_viewer/gae_g3dviewer.desktop | 1 +
source/gae-mime.xml | 16 +++++++++
source/glexemel/g3d_support.py | 53 ++++++++++++++++++++++++++++---
source/map_editor/gae_mapeditor.desktop | 1 +
5 files changed, 71 insertions(+), 5 deletions(-)
create mode 100644 source/gae-mime.xml
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-11-17 16:39:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via d404c6bf97fa9ddd3331b12182dadcbfb5c967f7 (commit)
from 1e9842bb7f90fbcb00625b196169963aa11e175a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d404c6bf97fa9ddd3331b12182dadcbfb5c967f7
Author: tetzank <te...@us...>
Date: Sat Nov 17 17:32:42 2012 +0100
blender import:
- improved error handling;
- got shape key animation working automatically, no workaround needed anymore;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 48 +++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 18 deletions(-)
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-09-20 19:15:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 1e9842bb7f90fbcb00625b196169963aa11e175a (commit)
via 20a37b3595b3758f65429741ba909f9a5d501f66 (commit)
via 85f2ba8ff98720e1393dde4d802926b2742be0e4 (commit)
via b58d58f3e70c6a16170a3f8e37643ffe0442af1b (commit)
from 20241ccc5e53fc7a00575f63899e7790add3c7fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1e9842bb7f90fbcb00625b196169963aa11e175a
Author: tetzank <te...@us...>
Date: Thu Sep 20 19:08:39 2012 +0200
blender import:
- added keyframes for shape key animation, somekind of update is still missing,
as a workaround you have to click on a shape key of the mesh, after that
animation should work normally;
blender export:
- fixed bug with duplicating vertices (vertex takes part in different faces
with different texcoords), reduces exported vertices considerable;
commit 20a37b3595b3758f65429741ba909f9a5d501f66
Author: tetzank <te...@us...>
Date: Thu Sep 20 02:54:27 2012 +0200
- removed compression of 3D textures because of problems with mesa,
it's of limited use anyway (only water);
commit 85f2ba8ff98720e1393dde4d802926b2742be0e4
Author: tetzank <te...@us...>
Date: Thu Sep 20 01:49:39 2012 +0200
G3D structure definition:
- show frames in vertex and normal data;
commit b58d58f3e70c6a16170a3f8e37643ffe0442af1b
Author: tetzank <te...@us...>
Date: Sat Sep 15 20:11:37 2012 +0200
- added structure definition of G3D for hex editor okteta,
only textured G3Dv4 (with non-selectable), untextured models won't work;
- updated README of glexemel to describe the different files there;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/G3D/g3d.desktop | 17 +++
source/glexemel/G3D/main.js | 153 ++++++++++++++++++++
source/glexemel/README | 30 +++--
source/glexemel/g3d_support.py | 31 +++-
.../shared_lib/sources/graphics/gl/texture_gl.cpp | 10 +-
5 files changed, 220 insertions(+), 21 deletions(-)
create mode 100644 source/glexemel/G3D/g3d.desktop
create mode 100644 source/glexemel/G3D/main.js
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-09-01 01:37:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 20241ccc5e53fc7a00575f63899e7790add3c7fc (commit)
from 13db9cfb92b7690334d3511402fda0b4168e5e1a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 20241ccc5e53fc7a00575f63899e7790add3c7fc
Author: tetzank <te...@us...>
Date: Mon Aug 6 19:12:31 2012 +0200
blender import:
- fixed for blender 2.63 and newer;
- use custom properties team color and non-selectable;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2012-07-01 10:49:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 13db9cfb92b7690334d3511402fda0b4168e5e1a (commit)
from 53e7ed8eb48fb75573ca850da82aa96e8e015e63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 13db9cfb92b7690334d3511402fda0b4168e5e1a
Author: silnarm <si...@us...>
Date: Sun Jul 1 20:48:40 2012 +1000
size variance (size-var and size-no-energy-var) for particles.
-----------------------------------------------------------------------
Summary of changes:
source/game/entities/game_particle.cpp | 49 ++++++++++--------
source/game/prototypes/particle_type.cpp | 5 +-
source/shared_lib/include/graphics/particle.h | 61 +++++++++++++++--------
source/shared_lib/sources/graphics/particle.cpp | 33 +++++++-----
4 files changed, 91 insertions(+), 57 deletions(-)
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2012-07-01 07:25:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 53e7ed8eb48fb75573ca850da82aa96e8e015e63 (commit)
via 8196efe6bb4cc2d65906a033aff10d2d3abb5f00 (commit)
from e931ed369f2d804c1cb71506a2c7a9c70c110f67 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53e7ed8eb48fb75573ca850da82aa96e8e015e63
Merge: 8196efe e931ed3
Author: silnarm <si...@us...>
Date: Sun Jul 1 17:23:18 2012 +1000
Merge branch 'master' of ssh://glestae.git.sourceforge.net/gitroot/glestae/glestae
commit 8196efe6bb4cc2d65906a033aff10d2d3abb5f00
Author: silnarm <si...@us...>
Date: Sun Jul 1 17:21:55 2012 +1000
multiple textures per particle system, hack fire system, fix skill based systems starting multiple times.
add support for multiple textures per particle system (max 4).
hack fire particle system to use two textures (with angular velocity) [needs work].
fix skill-Particle-Systems starting multiple times occasionally.
-----------------------------------------------------------------------
Summary of changes:
.../data/core/misc_textures/fire-particle1.bmp | Bin 0 -> 12342 bytes
.../data/core/misc_textures/fire-particle2.bmp | Bin 0 -> 12342 bytes
source/game/entities/game_particle.cpp | 28 ++++--
source/game/entities/game_particle.h | 2 +-
source/game/entities/unit.cpp | 38 +++++----
source/game/game/game.cpp | 2 +-
source/game/global/core_data.cpp | 4 +-
source/game/global/core_data.h | 6 +-
source/game/menu/menu_background.cpp | 2 +-
source/game/prototypes/particle_type.cpp | 41 ++++++---
.../include/graphics/gl/particle_renderer_gl.h | 11 ++-
source/shared_lib/include/graphics/particle.h | 23 ++++-
.../sources/graphics/gl/particle_renderer_gl.cpp | 87 ++++++++++++--------
source/shared_lib/sources/graphics/particle.cpp | 20 ++++-
14 files changed, 170 insertions(+), 94 deletions(-)
create mode 100644 data/game/data/core/misc_textures/fire-particle1.bmp
create mode 100644 data/game/data/core/misc_textures/fire-particle2.bmp
hooks/post-receive
--
glestae
|
|
From: Yggdrasil <te...@us...> - 2012-06-29 23:54:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via e931ed369f2d804c1cb71506a2c7a9c70c110f67 (commit)
from 0873842ac138e11ccf7f7a4272c82d407b3cf0e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e931ed369f2d804c1cb71506a2c7a9c70c110f67
Author: tetzank <te...@us...>
Date: Sat Jun 30 01:53:32 2012 +0200
blender export: added double sided to properties panel;
-----------------------------------------------------------------------
Summary of changes:
source/glexemel/g3d_support.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2012-06-28 18:30:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, master has been updated
via 0873842ac138e11ccf7f7a4272c82d407b3cf0e5 (commit)
via 48781173060b532fcc356f29dce2937deffde25f (commit)
via 2cc1cad9e1d57624917b19e1ee736f4691f7316c (commit)
via 095d4f7ff3ea7cb3b9754f67bcdbbc722683e9f2 (commit)
via 913b3da4314f48da0be9f588c9bbe99f51fcb51b (commit)
via ead3424c9ff79673ef5ee56ac0c4a6687da51317 (commit)
via e7210a0af52683304ff8d6a6c5083fcade4084d7 (commit)
via a0b422b0cab7e23ae20f4ae7576945c45eab7d32 (commit)
via 6c291ca8afaec2e0e130430b588bbd19111d5d1d (commit)
via cbf3b75c9fc438777724f39eae19353c7418da17 (commit)
via 694eafd323d28f97d61a911640e89db9daf5aed3 (commit)
via 74b873e33f4526b0d47c3185a941994b5fed782b (commit)
via 1f6c9c8a480e7c5e3fa02247c9a1107200667b68 (commit)
via a95023bd5e027c8d620337a66542a862768ecb3e (commit)
via 55ba08283105628538d41bfbb064e7e9873ae397 (commit)
via bbc3cfd10c514a2f996ee377d54cc25ae7a5ecab (commit)
via d525a496259ec016c11a53446dc0f98a2dba71cf (commit)
via 482f271aa1a974da91870131ca8613b48968d7f2 (commit)
via f768e47adefb39d38e985a9fa5524da5b35a75ba (commit)
via b1af5428b5b6a3dc9c2b0dbc2933a52cde00846c (commit)
via b5d8373d108b9823d2f8aa02c3b86ffbfaa414d8 (commit)
via 3d5e24e92d4bd94a5318d25f707e5180d1a45f58 (commit)
via c17dbd0c8fcf85a24645ada2efadf2762bb750aa (commit)
via b9cb4d636119f4ae705ce92d5715a4cd3e8fcc49 (commit)
via 87b648ae111062f052fc8380ead72a3ca6e47dd5 (commit)
via 39e7413e6cea4f10ff2ad392b659730a43877ca0 (commit)
via 65d59c3e99d67b4f7a8d7a140b7788846491f5ba (commit)
via b8e5349c88d566f5a2049050f491510c9126eb5a (commit)
via 64b785f911c4db6efbe6f81a722b1b98da48d7a9 (commit)
via 5a5177b6098da5d0c6429ca85bd1968574a813d4 (commit)
from 8aaea9fdd86e7ea23d9c8c8c19fd360e3f4cf8dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0873842ac138e11ccf7f7a4272c82d407b3cf0e5
Merge: 4878117 8aaea9f
Author: silnarm <si...@us...>
Date: Fri Jun 29 04:29:11 2012 +1000
Merge branch 'master' of ssh://glestae.git.sourceforge.net/gitroot/glestae/glestae
commit 48781173060b532fcc356f29dce2937deffde25f
Author: silnarm <si...@us...>
Date: Fri Jun 29 04:27:08 2012 +1000
orbital particle system 'emitters'
unit particle systems can now have an 'emitter-path', supported values atm are none and orbit.
commit 2cc1cad9e1d57624917b19e1ee736f4691f7316c
Author: silnarm <si...@us...>
Date: Thu Jun 28 02:50:41 2012 +1000
little refactor, remove some unnecessary stuff in Unit
commit 095d4f7ff3ea7cb3b9754f67bcdbbc722683e9f2
Author: silnarm <si...@us...>
Date: Thu Jun 28 02:49:58 2012 +1000
spinning particles
commit 913b3da4314f48da0be9f588c9bbe99f51fcb51b
Merge: a95023b ead3424
Author: silnarm <si...@us...>
Date: Tue Jun 26 17:35:17 2012 +1000
Merge branch '0.4.x'
commit a95023bd5e027c8d620337a66542a862768ecb3e
Merge: 1b73b88 55ba082
Author: silnarm <si...@us...>
Date: Mon Jun 25 09:54:29 2012 +1000
Merge branch '0.4.x'
Conflicts:
source/game/gui/display.cpp
source/shared_lib/sources/graphics/particle.cpp
-----------------------------------------------------------------------
Summary of changes:
data/game/gae/data/defeat_messages/gd.txt | 51 +++
data/game/gae/data/lang/ca.lng | 143 ------
data/game/gae/data/lang/cs.lng | 173 --------
data/game/gae/data/lang/da_DK.lng | 139 ------
data/game/gae/data/lang/de.lng | 192 --------
data/game/gae/data/lang/el.lng | 166 -------
data/game/gae/data/lang/en.lng | 11 +
data/game/gae/data/lang/eu.lng | 147 -------
data/game/gae/data/lang/fr.lng | 169 -------
data/game/gae/data/lang/gd.lng | 458 ++++++++++++++++++++
data/game/gae/data/lang/gl.lng | 163 -------
data/game/gae/data/lang/he.lng | 141 ------
data/game/gae/data/lang/hu.lng | 177 --------
data/game/gae/data/lang/it.lng | 323 ++++++++++++++
data/game/gae/data/lang/nl.lng | 139 ------
data/game/gae/data/lang/no_NO.lng | 175 --------
data/game/gae/data/lang/pl_PL.lng | 139 ------
data/game/gae/data/lang/pt_BR.lng | 169 -------
data/game/gae/data/lang/ro.lng | 259 -----------
data/game/gae/data/lang/sk_SK.lng | 144 ------
data/game/gae/data/lang/sr.lng | 152 -------
data/game/gae/data/lang/tr.lng | 169 -------
.../glest_classic/storming/storming_gd.lng | 11 +
.../advanced_tutorial/advanced_tutorial_gd.lng | 39 ++
.../basic_tutorial/basic_tutorial_gd.lng | 37 ++
.../magitech/factions/magic/lang/magic_gd.lng | 104 +++++
.../magitech/factions/magic/lang/magic_it.lng | 170 ++++++++
.../techs/magitech/factions/tech/lang/tech_gd.lng | 109 +++++
.../techs/magitech/factions/tech/lang/tech_it.lng | 170 ++++++++
data/game/techs/magitech/lang/magitech_gd.lng | 31 ++
data/game/techs/magitech/lang/magitech_it.lng | 170 ++++++++
.../shibboleth/factions/alpha/lang/alpha_gd.lng | 128 ++++++
data/game/techs/shibboleth/lang/shibboleth_gd.lng | 43 ++
source/game/entities/faction.cpp | 32 +-
source/game/entities/game_particle.cpp | 89 +++-
source/game/entities/game_particle.h | 3 +
source/game/entities/unit.cpp | 142 ++++---
source/game/entities/unit.h | 29 +-
source/game/facilities/logger.cpp | 13 +-
source/game/game/game.cpp | 36 +--
source/game/game/game.h | 6 +-
source/game/game/options.cpp | 4 +-
source/game/graphics/scene_culler.h | 86 ----
source/game/gui/display.cpp | 4 +-
source/game/gui/resource_bar.cpp | 28 +-
source/game/gui/user_interface.cpp | 15 +-
source/game/gui/user_interface.h | 7 +
source/game/main/battle_end.cpp | 2 +-
source/game/menu/menu_state_join_game.cpp | 10 +-
source/game/menu/menu_state_new_game.cpp | 2 +-
source/game/prototypes/cmd_types_general.cpp | 20 +-
source/game/prototypes/effect_type.cpp | 21 +-
source/game/prototypes/effect_type.h | 6 +-
source/game/prototypes/particle_type.cpp | 24 +
source/game/prototypes/particle_type.h | 10 +
source/game/prototypes/resource_type.cpp | 11 +
source/game/prototypes/resource_type.h | 18 +-
source/game/prototypes/skill_type.cpp | 27 +-
source/game/prototypes/skill_type.h | 4 +-
source/game/script/script_manager.cpp | 8 +-
source/game/widgets/widgets_base.cpp | 5 +-
source/game/world/map.h | 2 +-
source/game/world/tileset.cpp | 2 +-
source/shared_lib/include/graphics/particle.h | 60 ++-
source/shared_lib/include/math/math_util.h | 110 +++++
source/shared_lib/include/platform/timer.h | 1 +
source/shared_lib/include/xml/xml_parser.h | 9 +
.../sources/graphics/gl/particle_renderer_gl.cpp | 40 ++-
source/shared_lib/sources/graphics/particle.cpp | 50 ++-
.../sources/sound/ds8/sound_player_ds8.cpp | 171 ++++----
.../sources/sound/openal/sound_player_openal.cpp | 8 +-
71 files changed, 2545 insertions(+), 3381 deletions(-)
create mode 100644 data/game/gae/data/defeat_messages/gd.txt
delete mode 100644 data/game/gae/data/lang/ca.lng
delete mode 100644 data/game/gae/data/lang/cs.lng
delete mode 100644 data/game/gae/data/lang/da_DK.lng
delete mode 100644 data/game/gae/data/lang/de.lng
delete mode 100644 data/game/gae/data/lang/el.lng
delete mode 100644 data/game/gae/data/lang/eu.lng
delete mode 100644 data/game/gae/data/lang/fr.lng
create mode 100644 data/game/gae/data/lang/gd.lng
delete mode 100644 data/game/gae/data/lang/gl.lng
delete mode 100644 data/game/gae/data/lang/he.lng
delete mode 100644 data/game/gae/data/lang/hu.lng
create mode 100644 data/game/gae/data/lang/it.lng
delete mode 100644 data/game/gae/data/lang/nl.lng
delete mode 100644 data/game/gae/data/lang/no_NO.lng
delete mode 100644 data/game/gae/data/lang/pl_PL.lng
delete mode 100644 data/game/gae/data/lang/pt_BR.lng
delete mode 100644 data/game/gae/data/lang/ro.lng
delete mode 100644 data/game/gae/data/lang/sk_SK.lng
delete mode 100644 data/game/gae/data/lang/sr.lng
delete mode 100644 data/game/gae/data/lang/tr.lng
create mode 100644 data/game/gae/scenarios/glest_classic/storming/storming_gd.lng
create mode 100644 data/game/gae/scenarios/glest_tutorials/advanced_tutorial/advanced_tutorial_gd.lng
create mode 100644 data/game/gae/scenarios/glest_tutorials/basic_tutorial/basic_tutorial_gd.lng
create mode 100644 data/game/techs/magitech/factions/magic/lang/magic_gd.lng
create mode 100644 data/game/techs/magitech/factions/magic/lang/magic_it.lng
create mode 100644 data/game/techs/magitech/factions/tech/lang/tech_gd.lng
create mode 100644 data/game/techs/magitech/factions/tech/lang/tech_it.lng
create mode 100644 data/game/techs/magitech/lang/magitech_gd.lng
create mode 100644 data/game/techs/magitech/lang/magitech_it.lng
create mode 100644 data/game/techs/shibboleth/factions/alpha/lang/alpha_gd.lng
create mode 100644 data/game/techs/shibboleth/lang/shibboleth_gd.lng
hooks/post-receive
--
glestae
|
|
From: James M. <si...@us...> - 2012-06-26 05:10:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "glestae".
The branch, 0.4.x has been updated
via ead3424c9ff79673ef5ee56ac0c4a6687da51317 (commit)
via e7210a0af52683304ff8d6a6c5083fcade4084d7 (commit)
from a0b422b0cab7e23ae20f4ae7576945c45eab7d32 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ead3424c9ff79673ef5ee56ac0c4a6687da51317
Author: silnarm <si...@us...>
Date: Tue Jun 26 15:07:53 2012 +1000
prevent suicidal move command if right clicked enemy can't be attacked
commit e7210a0af52683304ff8d6a6c5083fcade4084d7
Author: silnarm <si...@us...>
Date: Tue Jun 26 15:06:52 2012 +1000
a couple of missing lang strings
-----------------------------------------------------------------------
Summary of changes:
data/game/gae/data/lang/en.lng | 2 ++
source/game/entities/unit.cpp | 38 +++++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 17 deletions(-)
hooks/post-receive
--
glestae
|
