Skip to content
Commits on Jan 10, 2012
  1. Merge "fix defect #489 operator cannot see game order"

    committed with Gerrit Code Review Jan 10, 2012
  2. Merge "Interactive game map"

    committed with Gerrit Code Review Jan 10, 2012
  3. Interactive game map

    lin committed Jan 10, 2012
    * Playing the game become easier
    
    Change-Id: Iab8f8e1bbe42ddd68275d8dda9f16dca602e27a7
Commits on Jan 9, 2012
  1. [#478,#479,#485] Bug fix: rule engine retreat phase bugs

    Andre Hilsendeger committed Dec 21, 2011
    * Illegal moves during retreat phase are no longer possible
    * Retreating units won't be disbanded any more
    
    Change-Id: I885d6720ed73af04434af7c038d5a3fc2325be39
  2. small fix

    Dilshod committed Jan 9, 2012
    - add link between syria and eastern mediterranean sea
    
    Change-Id: Ia48a2974bfcd1afe84316c84cb296ca89fde7bb4
Commits on Jan 5, 2012
  1. @olcai

    [#522] Add an example CM configuration file

    olcai committed Jan 5, 2012
    Change-Id: Ia74f3bb99ea8f7c48eb4c2149c5325f2d305df52
Commits on Jan 2, 2012
  1. fix defect #489 operator cannot see game order

    lin committed Jan 2, 2012
    * also fixed a bug in map_data by the way
    * fixed a bug in chatbox(in-message in textarea
      doesn't disappear after sent)
    * improved chatbox, when switch to gameover view,
      chatbox fill in game_id automatically
    
    Change-Id: Ic59f83e0eff956e4bbecf62023af1a10bae5ab01
Commits on Dec 21, 2011
  1. @jbothma

    Merge "[#406] Replace riak search by key filtering"

    jbothma committed with Gerrit Code Review Dec 21, 2011
  2. Merge "Fix defect #480, message display"

    Andre Hilsendeger committed with Gerrit Code Review Dec 21, 2011
  3. Merge "Small changes in map and its components"

    Andre Hilsendeger committed with Gerrit Code Review Dec 21, 2011
  4. Small changes in map and its components

    Dilshod committed Dec 21, 2011
    - Change army/fleet units' colorz;
    - Small changes in flagzzz;
    - Correct the typo on the map.
    
    Change-Id: I1223d9e18dfe27ea8f1568c83d87d790966e1446
Commits on Dec 20, 2011
  1. Fix defect #480, message display

    lin committed Dec 20, 2011
    * cross-site scripting in chatbox seems to be fixed
    * improve chatbox message display, now player can see which opponents
      the player has been talked to, also allow player quickly access a game
      once he/she receive a press from the game.
    * now game map is always aligned in the center of the browser window
    
    Change-Id: I11256b08aa4b0c71a36d36efb8d08ed85a14f738
  2. @jbothma

    Make fault_tolerance exist with nonzero exit status if the test fails.

    jbothma committed Dec 20, 2011
    To check this, add ?assert(false) to the top of the tests, run the tests
    and check exit code with echo $?.
    
    Change-Id: I4d5565c098f74117494819ee3acf972906019f38
  3. [#406] Replace riak search by key filtering

    Andre Hilsendeger committed Dec 16, 2011
    Some benchmarking showed, that performance was better without
    riak search for certain buckets:
    * Adds key filter helper function to db wrapper.
      While in there, I also removed all remaining traces of 2i.
    * Removes *messages.schema files.
    * Replaces search by key filtering:
      Unread messages are stored in a seperate bucket: <<"message_unread">>.
      The data in there only contains the id of the unread message in the real
      message bucket. The same applies for game_message and report_message.
      Keys look like this:
      * <<"message">>: <<"<unique-id>-<from-id>-<to-id>">>
      * <<"game_message">>: <<"<unique-id>-<from-id>-<to-id>-<game-id>-<year>-<season>-<phase>">>
        (yes, very long. let's see how it performs...)
      * <<"report_message">>: <<"<unique-id>-<to-role>">>
      * <<"corpses">>: <<"<node>-<module>-<unique-id>">>
    
    * Updating the game record in the join process doesn't use {w,0} anymore.
      Since this had some errors with the game_timer not getting the newest
      value on game start.
    
    Change-Id: I0680768811835712734a9934c73dc93ad7d29d44
  4. @rkmohammadi

    Merge "Fixed small annoyance with disappearing messages"

    rkmohammadi committed with Gerrit Code Review Dec 20, 2011
  5. @rkmohammadi

    Merge "Various small fixes of stuff found with Dialyzer"

    rkmohammadi committed with Gerrit Code Review Dec 20, 2011
  6. @tlou

    Merge "[#402] Add test for node failing when game is in a particular …

    tlou committed with Gerrit Code Review Dec 20, 2011
    …phase."
  7. @olcai

    Various small fixes of stuff found with Dialyzer

    olcai committed Dec 20, 2011
    Also removed a test that wasn't much of use as a result of some
    refactoring.
    
    Change-Id: Iff6952f268c7ba28243095635649064295477bb3
  8. Fixed small annoyance with disappearing messages

    committed Dec 20, 2011
    Change-Id: Ia444a0f80c6e17b208fc330318020ffe27f91067
  9. @jbothma

    [#402] Add test for node failing when game is in a particular phase.

    jbothma committed Dec 16, 2011
    This will run one long, slow test without messing with the internals
    of the backends to be as realistic as possible.
    It will then run for each of the ongoing phases the same test,
    but uses RPC to find out where the game is, advance the game to the
    phase we want to test using the sync_event hack, kill that backend,
    and then wait to see if the game still advances automatically.
    
    Also:
    - Make game_join_proc write with w,1 so that timer reads updated value.
    
    Change-Id: I81fb0ee4d95699f87d57226f09160753c88aa5ca
  10. @olcai

    Cleanup how external tests are compiled and run

    olcai committed Dec 19, 2011
    This change renames ejabberd_echo to xmpp_integration_test and removes several
    files that is no longer needed there.
    
    An updated version of Rebar is also provided since this gives us the ability to
    use the apps=/skip_apps= arguments. This new functionality is used to move the
    compile step of our integration tests into the top-level rebar.config. It also
    simplifies how we call integration tests in the test script.
    
    Change-Id: I0318acbbf66d29dfe796d2346ed39714fee1c3e2
  11. Merge "Game Timer holds game state"

    committed with Gerrit Code Review Dec 20, 2011
  12. @tlou

    Game Timer holds game state

    tlou committed Dec 20, 2011
    The game timer holds the game state, this cuts down on the amount
    of database calls when phase is changed and processed and also
    when pushing phase changes to players :)
    
    Change-Id: I136cdfb76ebbe806a735050a26fcc2779cddaefa
  13. [#488] Minor bug fixes

    committed Dec 20, 2011
    * Updated endpoint to handle user_msg invalid data
    * Updated web parser to handle different case for nicks
    * Updated user page form with labels
    
    Change-Id: I5b28e68bd37cb49603ca3eef2703c9a0460aa07a
  14. Merge "[#472] Black/White-list user (using XMPP, SMTP)"

    committed with Gerrit Code Review Dec 20, 2011
  15. Merge "[#403] fix double deliver message to online user"

    committed with Gerrit Code Review Dec 20, 2011
  16. Merge "[#439] adapt finished game overview"

    committed with Gerrit Code Review Dec 20, 2011
  17. @rkmohammadi

    [#403] fix double deliver message to online user

    rkmohammadi committed Dec 19, 2011
    when a user is online and get the message, the message store as read message to
    avoid push this mesage agian when user get online.
    
    Change-Id: Ib36c8490f104b575ce6e1fe38f0ede744922e876
  18. [#472] Black/White-list user (using XMPP, SMTP)

    Dilshod committed Dec 20, 2011
    - Operators and Moderators are able to blacklist/whitelist users
      using IM and Email;
    
    - XMPP integration tests.
    
    Change-Id: I2efb4e8335cab4f0dcd25e1becded648c5ab76df
  19. @rkmohammadi

    [#439] adapt finished game overview

    rkmohammadi committed Dec 20, 2011
    Change-Id: I69d0bca202a2a44052fd181bca1a9f677860870d
  20. Merge "Fix defect #473 #476 #483"

    committed with Gerrit Code Review Dec 20, 2011
  21. Merge "Rule engine feedback in game overview"

    committed with Gerrit Code Review Dec 20, 2011
  22. Merge "[#487] Handle messages being sent to blacklisted users"

    committed with Gerrit Code Review Dec 20, 2011
  23. @tlou

    Rule engine feedback in game overview

    tlou committed Dec 20, 2011
    Provided feedback:
     * if a unit (and which) is dislodged
     * how many units a nation can build
    
    Change-Id: I9663747dc7b485cd3f47a7550441eaa78b37ef43
  24. @rkmohammadi

    [#487] Handle messages being sent to blacklisted users

    rkmohammadi committed Dec 20, 2011
    Change-Id: I3049da1d971236c19cb6072165e75ce530524386
Something went wrong with that request. Please try again.